Below is the list of changes that have just been committed into a local
6.0 repository of skozlov. When skozlov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-21 13:31:29+04:00, skozlov@stripped +3 -0
Bug#32673, added --sorted_result for SELECT
mysql-test/extra/rpl_tests/rpl_row_sp002.test@stripped, 2008-04-21 13:31:26+04:00, skozlov@stripped +16 -5
test case
mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result@stripped, 2008-04-21 13:31:26+04:00, skozlov@stripped +8 -8
updated result file
mysql-test/suite/rpl/t/disabled.def@stripped, 2008-04-21 13:31:26+04:00, skozlov@stripped +0 -1
updated disbaled.def
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_row_sp002.test b/mysql-test/extra/rpl_tests/rpl_row_sp002.test
--- a/mysql-test/extra/rpl_tests/rpl_row_sp002.test 2007-03-29 22:31:01 +04:00
+++ b/mysql-test/extra/rpl_tests/rpl_row_sp002.test 2008-04-21 13:31:26 +04:00
@@ -65,7 +65,7 @@ call test.p1('MySQL');
let $message=< -- test 1 select master after p1 -- >;
--source include/show_msg.inc
-
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -74,6 +74,7 @@ let $message=< -- test 1 select slave af
save_master_pos;
connection slave;
sync_with_master;
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -81,6 +82,7 @@ let $message=< -- test 1 call p2 & selec
--source include/show_msg.inc
connection master;
call test.p2(4);
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -89,6 +91,7 @@ let $message=< -- test 1 select slave af
save_master_pos;
connection slave;
sync_with_master;
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -131,6 +134,7 @@ CALL test.p1(6,'MySQL');
let $message=< -- test 2 select Master after p1 -- >;
--source include/show_msg.inc
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -139,6 +143,7 @@ let $message=< -- test 2 select Slave af
save_master_pos;
connection slave;
sync_with_master;
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -148,6 +153,7 @@ connection master;
CALL test.p2(2);
CALL test.p2(4);
CALL test.p2(6);
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -156,6 +162,7 @@ let $message=< -- test 1 select Slave af
save_master_pos;
connection slave;
sync_with_master;
+--sorted_result
SELECT * FROM test.t1;
SELECT * FROM test.t2;
@@ -194,11 +201,13 @@ while ($n)
-- enable_query_log
ROLLBACK;
-select * from test.t3;
+--sorted_result
+SELECT * FROM test.t3;
save_master_pos;
connection slave;
sync_with_master;
-select * from test.t3;
+--sorted_result
+SELECT * FROM test.t3;
connection master;
START TRANSACTION;
@@ -215,11 +224,13 @@ while ($n>3)
-- enable_query_log
COMMIT;
-select * from test.t3;
+--sorted_result
+SELECT * FROM test.t3;
save_master_pos;
connection slave;
sync_with_master;
-select * from test.t3;
+--sorted_result
+SELECT * FROM test.t3;
connection master;
#show binlog events from 1627;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result b/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result 2007-06-27 16:27:30 +04:00
+++ b/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result 2008-04-21 13:31:26 +04:00
@@ -169,10 +169,10 @@ CALL test.p2(6);
SELECT * FROM test.t1;
a t
1 texas
-3 next
-5 OK
20 Live
+3 next
40 to
+5 OK
60 MySQL
SELECT * FROM test.t2;
a f
@@ -188,10 +188,10 @@ a f
SELECT * FROM test.t1;
a t
1 texas
-3 next
-5 OK
20 Live
+3 next
40 to
+5 OK
60 MySQL
SELECT * FROM test.t2;
a f
@@ -217,16 +217,16 @@ end|
SET AUTOCOMMIT=0;
START TRANSACTION;
ROLLBACK;
-select * from test.t3;
+SELECT * FROM test.t3;
a t
-select * from test.t3;
+SELECT * FROM test.t3;
a t
START TRANSACTION;
COMMIT;
-select * from test.t3;
+SELECT * FROM test.t3;
a t
98 NONE
-select * from test.t3;
+SELECT * FROM test.t3;
a t
98 NONE
SET AUTOCOMMIT=1;
diff -Nrup a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
--- a/mysql-test/suite/rpl/t/disabled.def 2008-03-30 11:17:06 +04:00
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-04-21 13:31:26 +04:00
@@ -23,7 +23,6 @@ rpl_extraColmaster_innodb : BUG#30854 :
rpl_extraColmaster_myisam : BUG#30854
rpl_view : Bug#32654: rpl_view.test fails randomly
rpl_ndb_multi : Bug#30751: rpl_ndb_multi missing row in output
-rpl_row_sp002_innodb : Bug#32673 rpl_row_sp002_innodb.test fails randomly
rpl_ssl : Bug#32217 rpl_ssl fails with different number of records on master and slave
rpl_row_until : Bug#28772 rpl_row_until fails in pushbuild
rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
