database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Code Activity

Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src

Browse Source 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
This commit is contained in:
unknown
2006-04-20 12:35:10 +02:00
parent d27c7a7c80 78342cd64b
commit 58938d21ca
2 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/t/rpl_deadlock.test
View File

@@ -67,7 +67,9 @@ select * from t2;
# check that no error is reported
--replace_column 1 # 8 # 9 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
--horizontal_results
# 2) Test lock wait timeout
@@ -82,9 +84,11 @@ sync_with_master;
select * from t1; # check that slave succeeded finally
select * from t2;
# check that no error is reported
--replace_column 1 # 8 # 9 # 23 # 33 #
--replace_column 1 # 8 # 9 # 11 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
--horizontal_results
# Now we repeat 2), but with BEGIN in the same relay log as
# COMMIT (to see if seeking into hot log is ok).
@@ -104,7 +108,9 @@ select * from t1;
select * from t2;
--replace_column 1 # 8 # 9 # 11 # 23 # 33 #
--replace_result $MASTER_MYPORT MASTER_MYPORT
--vertical_results
show slave status;
--horizontal_results
connection master;
drop table t1,t2,t3,t4;