database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

Browse Source
This commit is contained in:
Sven Sandberg
2010-12-19 18:15:12 +01:00
parent a3cc81fa70 8b27f9a05e
commit 1bd213aec3
831 changed files with 7924 additions and 6322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/rpl/t/rpl_concurrency_error.test
View File

@@ -127,13 +127,11 @@ while ($type)
connection master;
sync_slave_with_master;
connection master;
let $diff_statement= SELECT * FROM t order by i;
source include/diff_master_slave.inc;
let $rpl_diff_statement= SELECT * FROM t order by i;
source include/rpl_diff.inc;
connection master;
let $diff_statement= SELECT * FROM n order by d, f;
source include/diff_master_slave.inc;
let $rpl_diff_statement= SELECT * FROM n order by d, f;
source include/rpl_diff.inc;
--echo ########################################################################
--echo # Cleanup
@@ -149,3 +147,4 @@ sync_slave_with_master;
connection master;
disconnect conn1;
disconnect conn2;
--source include/rpl_end.inc