Commit 828801bb authored by unknown's avatar unknown

Fix for non-deterministic behavior of SELECTs and VIEWs


mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
  Added ORDER BY for SELECT
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
  Added ORDER BY for VIEW
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Added ORDER BY for SELECT
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Updated result file
parent 1590fa13
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
--echo ==========MASTER========== --echo ==========MASTER==========
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
SELECT * FROM t1; SELECT * FROM t1 ORDER BY a;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
SELECT * FROM t2; SELECT * FROM t2 ORDER BY a;
sync_slave_with_master; sync_slave_with_master;
--echo ==========SLAVE=========== --echo ==========SLAVE===========
USE test_rpl; USE test_rpl;
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
SELECT * FROM t1; SELECT * FROM t1 ORDER BY a;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
SELECT * FROM t2; SELECT * FROM t2 ORDER BY a;
connection master; connection master;
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
--echo ==========MASTER========== --echo ==========MASTER==========
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
SELECT * FROM v1; SELECT * FROM v1 ORDER BY a;
sync_slave_with_master; sync_slave_with_master;
--echo ==========SLAVE=========== --echo ==========SLAVE===========
USE test_rpl; USE test_rpl;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
SELECT * FROM v1; SELECT * FROM v1 ORDER BY a;
connection master; connection master;
...@@ -54,7 +54,7 @@ DELETE FROM t2 WHERE a = 2; ...@@ -54,7 +54,7 @@ DELETE FROM t2 WHERE a = 2;
--exec cp ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/ --exec cp ./suite/rpl/data/rpl_mixed.dat $MYSQLTEST_VARDIR/tmp/
LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ; LOAD DATA INFILE '../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;
--exec rm $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat --exec rm $MYSQLTEST_VARDIR/tmp/rpl_mixed.dat
SELECT * FROM t1; SELECT * FROM t1 ORDER BY a;
--source suite/rpl/include/rpl_mixed_check_select.inc --source suite/rpl/include/rpl_mixed_check_select.inc
--source suite/rpl/include/rpl_mixed_clear_tables.inc --source suite/rpl/include/rpl_mixed_clear_tables.inc
...@@ -75,7 +75,7 @@ DELETE FROM t1 WHERE a = 2; ...@@ -75,7 +75,7 @@ DELETE FROM t1 WHERE a = 2;
--echo --echo
--echo ******************** SELECT ******************** --echo ******************** SELECT ********************
INSERT INTO t1 VALUES(1, 't1, text 1'); INSERT INTO t1 VALUES(1, 't1, text 1');
SELECT * FROM t1 WHERE b <> UUID(); SELECT * FROM t1 WHERE b <> UUID() ORDER BY a;
--source suite/rpl/include/rpl_mixed_clear_tables.inc --source suite/rpl/include/rpl_mixed_clear_tables.inc
# JOIN # JOIN
...@@ -85,8 +85,8 @@ INSERT INTO t1 VALUES(1, 'CCC'); ...@@ -85,8 +85,8 @@ INSERT INTO t1 VALUES(1, 'CCC');
INSERT INTO t1 VALUES(2, 'DDD'); INSERT INTO t1 VALUES(2, 'DDD');
INSERT INTO t2 VALUES(1, 'DDD'); INSERT INTO t2 VALUES(1, 'DDD');
INSERT INTO t2 VALUES(2, 'CCC'); INSERT INTO t2 VALUES(2, 'CCC');
SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a; SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.a ORDER BY t1.a,t2.a;
SELECT * FROM t1 INNER JOIN t2 ON t1.b = t2.b; SELECT * FROM t1 INNER JOIN t2 ON t1.b = t2.b ORDER BY t1.a,t2.a;
--source suite/rpl/include/rpl_mixed_clear_tables.inc --source suite/rpl/include/rpl_mixed_clear_tables.inc
# UNION # UNION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment