3149 Serge Kozlov 2009-11-28
WL#3894, post-push fix.
modified:
mysql-test/extra/rpl_tests/rpl_row_func003.test
mysql-test/suite/rpl/r/rpl_bug33931.result
3148 Serge Kozlov 2009-11-28
Backport for WL#3894
modified:
mysql-test/suite/rpl/t/rpl000010.test
mysql-test/suite/rpl/t/rpl000011.test
mysql-test/suite/rpl/t/rpl000013.test
mysql-test/suite/rpl/t/rpl000017-slave.sh*
mysql-test/suite/rpl/t/rpl_000015.test
mysql-test/suite/rpl/t/rpl_alter.test
mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
mysql-test/suite/rpl/t/rpl_bit.test
mysql-test/suite/rpl/t/rpl_bit_npk.test
mysql-test/suite/rpl/t/rpl_bug33931.test
mysql-test/suite/rpl/t/rpl_change_master.test
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
mysql-test/suite/rpl/t/rpl_colSize.test
mysql-test/suite/rpl/t/rpl_do_grant.test
mysql-test/suite/rpl/t/rpl_drop.test
mysql-test/suite/rpl/t/rpl_drop_view.test
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh*
mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh*
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
mysql-test/suite/rpl/t/rpl_loaddata_charset.test
mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
mysql-test/suite/rpl/t/rpl_loaddata_m.test
mysql-test/suite/rpl/t/rpl_loaddata_s.test
mysql-test/suite/rpl/t/rpl_loaddatalocal.test
mysql-test/suite/rpl/t/rpl_master_pos_wait.test
mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh*
mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
mysql-test/suite/rpl/t/rpl_multi_delete.test
mysql-test/suite/rpl/t/rpl_multi_delete2.test
mysql-test/suite/rpl/t/rpl_optimize.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_ps.test
mysql-test/suite/rpl/t/rpl_relayspace.test
mysql-test/suite/rpl/t/rpl_replicate_do.test
mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh*
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_row_sp001.test
mysql-test/suite/rpl/t/rpl_row_sp005.test
mysql-test/suite/rpl/t/rpl_row_sp008.test
mysql-test/suite/rpl/t/rpl_row_sp009.test
mysql-test/suite/rpl/t/rpl_row_sp010.test
mysql-test/suite/rpl/t/rpl_row_trig002.test
mysql-test/suite/rpl/t/rpl_row_trig003.test
mysql-test/suite/rpl/t/rpl_server_id2.test
mysql-test/suite/rpl/t/rpl_session_var.test
mysql-test/suite/rpl/t/rpl_set_charset.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_sp.test
mysql-test/suite/rpl/t/rpl_sp004.test
mysql-test/suite/rpl/t/rpl_sporadic_master.test
mysql-test/suite/rpl/t/rpl_ssl1.test
mysql-test/suite/rpl/t/rpl_start_stop_slave.test
mysql-test/suite/rpl/t/rpl_stm_until.test
mysql-test/suite/rpl/t/rpl_temp_table.test
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/suite/rpl/t/rpl_user_variables.test
mysql-test/suite/rpl/t/rpl_view.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_func003.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_func003.test 2009-11-26 23:32:01 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_func003.test 2009-11-28 14:53:48 +0000
@@ -3,10 +3,7 @@
# Original Date: Aug/15/2005 #
# Update: 08/29/2005 Comment out sleep. Only needed for debugging #
#############################################################################
-# Note: Many lines are commented out in this test case. These were used for #
-# creating the test case and debugging and are being left for #
-# debugging, but they can not be used for the regular testing as the #
-# Time changes and is not deteministic, so instead we dump both the #
+# Note: Time changes and is not deteministic, so instead we dump both the #
# master and slave and diff the dumps. If the dumps differ then the #
# test case will fail. To run during diff failuers, comment out the #
# diff. #
@@ -26,7 +23,6 @@ DROP TABLE IF EXISTS test.t1;
--enable_warnings
-
eval CREATE TABLE test.t1 (a INT NOT NULL AUTO_INCREMENT, c CHAR(16),PRIMARY KEY(a))ENGINE=$engine_type;
delimiter |;
@@ -44,34 +40,24 @@ END|
delimiter ;|
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
-let $wait_time= 6;
---source include/wait_for_ndb_to_binlog.inc
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
---source include/wait_for_ndb_to_binlog.inc
-
-#Select in this test are used for debugging
-#select * from test.t1;
-#connection slave;
-#select * from test.t1;
-connection master;
SET AUTOCOMMIT=0;
START TRANSACTION;
INSERT INTO test.t1 VALUES (null,test.f1());
ROLLBACK;
SET AUTOCOMMIT=1;
-#select * from test.t1;
-#sleep 6;
-
-#connection slave;
-#select * from test.t1;
-
-#connection master;
-#used for debugging
-#show binlog events;
+# Sync master and slave for all engines except NDB
+if (`SELECT UPPER(LEFT('$engine_type', 3)) != 'NDB'`) {
+ sync_slave_with_master;
+ connection master;
+}
+# Sync master and slave for NDB engine
+let $wait_time= 6;
+--source include/wait_for_ndb_to_binlog.inc
-# time to dump the databases and so we can see if they match
+# Time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql
@@ -88,5 +74,8 @@ DROP TABLE test.t1;
diff_files $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
+# Clean up
+remove_file $MYSQLTEST_VARDIR/tmp/func003_master.sql;
+remove_file $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
# End of 5.0 test case
=== modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result 2009-11-04 12:28:20 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result 2009-11-28 14:53:48 +0000
@@ -1,7 +1,6 @@
reset master;
reset slave;
call mtr.add_suppression("Failed during slave I/O thread initialization");
-stop slave;
SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
start slave;
show slave status;
| Thread |
|---|
| • bzr push into mysql-5.1-rep+2 branch (Serge.Kozlov:3148 to 3149) WL#3894 | Serge Kozlov | 28 Nov |
