summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2009-09-30 15:17:15 +0100
committerAlfranio Correia <alfranio.correia@sun.com>2009-09-30 15:17:15 +0100
commit9922788d7a79318f82d798015e0854ec243447c6 (patch)
tree273892514e822820a91c1ad04706fb83c277d563 /mysql-test/extra
parent2f51f7582599d20e1bab25d5dd4bd453ad009568 (diff)
downloadmariadb-git-9922788d7a79318f82d798015e0854ec243447c6.tar.gz
Post-fix for BUG#43789
NOTE: Backporting the patch to next-mr.
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/rpl_tests/rpl_not_null.test36
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_not_null.test b/mysql-test/extra/rpl_tests/rpl_not_null.test
index 88f37f9a95e..58dbd9ce29f 100644
--- a/mysql-test/extra/rpl_tests/rpl_not_null.test
+++ b/mysql-test/extra/rpl_tests/rpl_not_null.test
@@ -81,13 +81,13 @@ source include/diff_tables.inc;
--echo TABLES t2 and t3 must be different.
connection master;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
connection slave;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
connection master;
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
connection slave;
-SELECT * FROM t4;
+SELECT * FROM t4 ORDER BY a;
--echo ************* EXECUTION WITH UPDATES and REPLACES *************
connection master;
@@ -139,9 +139,9 @@ INSERT INTO t1(a) VALUES (5);
--echo TABLES t1 and t2 must be different.
sync_slave_with_master;
connection master;
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
connection slave;
-SELECT a,b+0,c+0 FROM t1;
+SELECT a,b+0,c+0 FROM t1 ORDER BY a;
--echo ************* EXECUTION WITH UPDATES and REPLACES *************
connection master;
@@ -262,17 +262,17 @@ sync_slave_with_master;
# connection slave;
# --source include/wait_for_slave_sql_to_stop.inc
# connection master;
-# SELECT * FROM t1;
+# SELECT * FROM t1 ORDER BY a;
# connection slave;
-# SELECT * FROM t1;
+# SELECT * FROM t1 ORDER BY a;
# connection master;
-# SELECT * FROM t2;
+# SELECT * FROM t2 ORDER BY a;
# connection slave;
-# SELECT * FROM t2;
+# SELECT * FROM t2 ORDER BY a;
# connection master;
-# SELECT * FROM t3;
+# SELECT * FROM t3 ORDER BY a;
# connection slave;
-# SELECT * FROM t3;
+# SELECT * FROM t3 ORDER BY a;
# --source include/reset_master_and_slave.inc
#
# connection master;
@@ -343,17 +343,17 @@ connection master;
sync_slave_with_master;
connection master;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
connection slave;
-SELECT * FROM t1;
+SELECT * FROM t1 ORDER BY a;
connection master;
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
connection slave;
-SELECT * FROM t2;
+SELECT * FROM t2 ORDER BY a;
connection master;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
connection slave;
-SELECT * FROM t3;
+SELECT * FROM t3 ORDER BY a;
connection master;