Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3a3d673d
Commit
3a3d673d
authored
Oct 30, 2006
by
aelkin/elkin@dsl-hkigw8-feaef900-46.dhcp.inet.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#20697 slave fails to rollback replicated transaction hang over innodb_lock_wait_timeou
post-merge fixes in test/result
parent
f25db09b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
11 deletions
+20
-11
mysql-test/extra/rpl_tests/rpl_deadlock.test
mysql-test/extra/rpl_tests/rpl_deadlock.test
+2
-2
mysql-test/r/rpl_deadlock_innodb.result
mysql-test/r/rpl_deadlock_innodb.result
+18
-9
No files found.
mysql-test/extra/rpl_tests/rpl_deadlock.test
View file @
3a3d673d
...
...
@@ -75,7 +75,7 @@ show slave status;
stop
slave
;
delete
from
t3
;
change
master
to
master_log_pos
=
54
3
;
# the BEGIN log event
change
master
to
master_log_pos
=
54
4
;
# the BEGIN log event
begin
;
select
*
from
t2
for
update
;
# hold lock
start
slave
;
...
...
@@ -100,7 +100,7 @@ set global max_relay_log_size=0;
# This is really copy-paste of 2) of above
stop
slave
;
delete
from
t3
;
change
master
to
master_log_pos
=
54
3
;
change
master
to
master_log_pos
=
54
4
;
begin
;
select
*
from
t2
for
update
;
start
slave
;
...
...
mysql-test/r/rpl_deadlock_innodb.result
View file @
3a3d673d
...
...
@@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=innodb;
CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=innodb;
CREATE TABLE t3 (a INT) ENGINE=innodb;
CREATE TABLE t3 (a INT
UNIQUE
) ENGINE=innodb;
CREATE TABLE t4 (a INT) ENGINE=innodb;
show variables like 'slave_transaction_retries';
Variable_name Value
...
...
@@ -35,14 +35,14 @@ begin;
select * from t1 for update;
a
start slave;
insert into t2 values(2
2
);
insert into t2 values(2
01
);
commit;
select * from t1;
a
1
select * from t2;
a
2
2
2
01
show slave status;
Slave_IO_State #
Master_Host 127.0.0.1
...
...
@@ -78,12 +78,16 @@ Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
stop slave;
change master to master_log_pos=536;
delete from t3;
change master to master_log_pos=544;
begin;
select * from t2 for update;
a
2
2
2
01
start slave;
select count(*) from t3 /* must be zero */;
count(*)
0
commit;
select * from t1;
a
...
...
@@ -91,7 +95,7 @@ a
1
select * from t2;
a
2
2
2
01
show slave status;
Slave_IO_State #
Master_Host 127.0.0.1
...
...
@@ -128,12 +132,16 @@ Master_SSL_Key
Seconds_Behind_Master #
set global max_relay_log_size=0;
stop slave;
change master to master_log_pos=536;
delete from t3;
change master to master_log_pos=544;
begin;
select * from t2 for update;
a
2
2
2
01
start slave;
select count(*) from t3 /* must be zero */;
count(*)
0
commit;
select * from t1;
a
...
...
@@ -142,7 +150,7 @@ a
1
select * from t2;
a
2
2
2
01
show slave status;
Slave_IO_State #
Master_Host 127.0.0.1
...
...
@@ -178,3 +186,4 @@ Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
drop table t1,t2,t3,t4;
End of 5.1 tests
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment