List:Commits« Previous MessageNext Message »
From:Sven Sandberg Date:November 30 2010 2:47pm
Subject:bzr commit into mysql-5.5-bugteam branch (sven.sandberg:3135) Bug#49978
View as plain text  
#At file:///home/sven/bzr/b49978-cleanup_rpl_tests/1/5.5-bugteam/ based on revid:sven.sandberg@stripped

 3135 Sven Sandberg	2010-11-30 [merge]
      First, BUG#49978 was committed locally in 5.1-bugteam and merged to 5.5-bugteam.
      Then, independent work was pushed in 5.1-bugteam and 5.5-bugteam.
      Then, BUG#49978 was merged with the independent work
      in 5.1-bugteam and 5.5-bugteam separately.
      The present changeset is the result of merging the merge changeset
      in 5.1-bugteam up to 5.5-bugteam.
      Conflicts resolved manually:
      Path conflict: <deleted> / mysql-test/suite/rpl/t/rpl_000017-slave.opt
      Text conflict in mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_insert_id.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp002.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_stop_slave.test
      Text conflict in mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
      Conflict adding file mysql-test/include/force_restart.inc.  Moved existing file to mysql-test/include/force_restart.inc.moved.
      Conflict adding file mysql-test/include/force_restart_if_skipped.inc.  Moved existing file to mysql-test/include/force_restart_if_skipped.inc.moved.
      Text conflict in mysql-test/suite/bugs/t/rpl_bug37426.test
      Text conflict in mysql-test/suite/rpl/include/rpl_mixed_ddl.inc
      Text conflict in mysql-test/suite/rpl/include/rpl_mixed_dml.inc
      Text conflict in mysql-test/suite/rpl/r/rpl_alter.result
      Text conflict in mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      Text conflict in mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
      Text conflict in mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      Text conflict in mysql-test/suite/rpl/r/rpl_row_conflicts.result
      Text conflict in mysql-test/suite/rpl/r/rpl_stop_slave.result
      Text conflict in mysql-test/suite/rpl/t/rpl_alter.test
      Text conflict in mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_do_grant.test
      Text conflict in mysql-test/suite/rpl/t/rpl_drop.test
      Text conflict in mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
      Text conflict in mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
      Text conflict in mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_ignore_table.test
      Text conflict in mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
      Text conflict in mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
      Text conflict in mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test

    removed:
      mysql-test/include/force_restart.inc
      mysql-test/include/force_restart_if_skipped.inc
    added:
      mysql-test/include/force_restart.inc
      mysql-test/include/force_restart_if_skipped.inc
    modified:
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_ddl.test
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/extra/rpl_tests/rpl_sv_relay_space.test
      mysql-test/suite/bugs/t/rpl_bug36391.test
      mysql-test/suite/bugs/t/rpl_bug37426.test
      mysql-test/suite/rpl/include/rpl_mixed_ddl.inc
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc
      mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
      mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
      mysql-test/suite/rpl/t/rpl_failed_optimize.test
      mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
      mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
      mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
      mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
      mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
      mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
      mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
      mysql-test/suite/rpl/t/rpl_stm_conflicts.test
      mysql-test/suite/rpl/t/rpl_stm_multi_query.test
      mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
      mysql-test/suite/rpl/t/rpl_variables.test
      mysql-test/suite/rpl/t/rpl_variables_stm.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_conflicts.test'
--- a/mysql-test/extra/rpl_tests/rpl_conflicts.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_conflicts.test	2010-11-30 14:46:37 +0000
@@ -144,8 +144,13 @@ if (`SELECT @@global.binlog_format = 'RO
   --echo ---- Wait until slave stops with an error ----
   let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND
   source include/wait_for_slave_sql_error.inc;
-  let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
-  --echo Last_SQL_Error = $err (expected "can't find record" error)
+
+  --let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1)
+  --replace_regex /end_log_pos [0-9]+/end_log_pos END_LOG_POS/
+  --disable_query_log
+  --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
+  --enable_query_log
+
   SELECT * FROM t1;
 
   --echo ---- Resolve the conflict on the slave and restart SQL thread ----
@@ -170,4 +175,4 @@ connection master;
 DROP TABLE t1;
 
 --echo [on slave]
-sync_slave_with_master;
+--sync_slave_with_master

=== modified file 'mysql-test/extra/rpl_tests/rpl_ddl.test'
--- a/mysql-test/extra/rpl_tests/rpl_ddl.test	2010-10-06 12:47:47 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_ddl.test	2010-11-29 12:09:17 +0000
@@ -136,14 +136,6 @@ sync_slave_with_master;
 connection master;
 SET AUTOCOMMIT = 1;
 #
-# 1. DROP all objects, which probably already exist, but must be created here
-#
---disable_warnings
-DROP DATABASE IF EXISTS mysqltest1;
-DROP DATABASE IF EXISTS mysqltest2;
-DROP DATABASE IF EXISTS mysqltest3;
---enable_warnings
-#
 # 2. CREATE all objects needed
 #    working database is mysqltest1
 #    working table (transactional!) is mysqltest1.t1 
@@ -619,4 +611,3 @@ connection master;
 DROP DATABASE mysqltest1;
 # mysqltest2 was alreday DROPPED some tests before.
 DROP DATABASE mysqltest3;
---enable_warnings

=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test	2010-11-30 14:46:37 +0000
@@ -2,11 +2,7 @@
 # Purpose: To test having extra columns on the master WL#3915
 # engine inspecific sourced part
 #############################################################
-# TODO: partition specific
-# -- source include/have_partition.inc
-# Note: Will be done in different test due to NDB using this
-#       test case.
-############################################################
+
 #
 # Setup differently defined tables on master and slave
 #

=== modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test	2010-11-30 14:46:37 +0000
@@ -719,6 +719,10 @@ sync_slave_with_master;
 --replace_column 5 CURRENT_TIMESTAMP
 SELECT * FROM t14a ORDER BY c1;
 
+--connection master
+DROP TABLE t14a;
+--sync_slave_with_master
+
 ####################################################
 # - Alter Master Dropping columns from the middle. #
 #   Expect: columns dropped                        #
@@ -738,7 +742,7 @@ SELECT * FROM t14 ORDER BY c1;
 
 --echo *** Drop t14  ***
 connection master;
-DROP TABLE t14, t14a;
+DROP TABLE t14;
 sync_slave_with_master;
 
 ##############################################################

=== modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test	2010-11-30 14:46:37 +0000
@@ -11,6 +11,7 @@
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986)
 
+-- source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 source include/have_innodb.inc;
 
@@ -44,9 +45,7 @@ create table t3 (day date,id int(9),cate
 insert into t3 select * from t2;
 --enable_warnings
 
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 
 select * from t1;
 select * from t3;
@@ -58,9 +57,7 @@ drop table t2;
 drop table t3;
 create table t1(a int, b int, unique(b));
 
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 
 # See if slave stops when there's a duplicate entry for key error in LOAD DATA
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test	2010-11-30 14:46:37 +0000
@@ -14,8 +14,6 @@ flush tables;
 SELECT * FROM t1 ORDER BY a;
 sync_slave_with_master;
 
-connection master;
-sync_slave_with_master;
 SELECT * FROM t1 ORDER BY a;
 connection master;
 drop table t1;

=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2010-11-16 16:08:04 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2010-11-30 14:46:37 +0000
@@ -52,7 +52,7 @@ source include/wait_for_slave_sql_to_sto
 
 --echo # Slave should stop after the transaction has committed.
 --echo # So t1 on master is same to t1 on slave.
---let diff_tables= master:t1, slave:t1
+--let $diff_tables= master:t1, slave:t1
 --source include/diff_tables.inc
 
 connection slave;

=== modified file 'mysql-test/extra/rpl_tests/rpl_sv_relay_space.test'
--- a/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test	2010-11-30 14:46:37 +0000
@@ -22,5 +22,4 @@ SELECT * FROM t1 ORDER BY id;
 connection master;
 DROP TABLE t1;
 
-# End of 4.1 tests
 --source include/rpl_end.inc

=== added file 'mysql-test/include/force_restart.inc'
--- a/mysql-test/include/force_restart.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/force_restart.inc	2010-11-29 12:09:17 +0000
@@ -0,0 +1,17 @@
+# ==== Purpose ====
+#
+# Tell mtr that all servers must be restarted after the test has
+# finished.
+#
+# ==== Usage ====
+#
+# --source include/force_restart.inc
+#
+# ==== See also ====
+#
+# include/force_restart_if_skipped.inc
+
+--let $_force_restart_datadir= `SELECT @@datadir`
+--append_file $_force_restart_datadir/mtr/force_restart
+1
+EOF

=== removed file 'mysql-test/include/force_restart.inc'
--- a/mysql-test/include/force_restart.inc	2010-11-29 12:12:10 +0000
+++ b/mysql-test/include/force_restart.inc	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# ==== Purpose ====
-#
-# Tell mtr that all servers must be restarted after the test has
-# finished.
-#
-# ==== Usage ====
-#
-# --source include/force_restart.inc
-#
-# ==== See also ====
-#
-# include/force_restart_if_skipped.inc
-
---let $_force_restart_datadir= `SELECT @@datadir`
---append_file $_force_restart_datadir/mtr/force_restart
-1
-EOF

=== removed file 'mysql-test/include/force_restart_if_skipped.inc'
--- a/mysql-test/include/force_restart_if_skipped.inc	2010-11-29 12:12:10 +0000
+++ b/mysql-test/include/force_restart_if_skipped.inc	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# ==== Purpose ====
-#
-# Tell mtr that all servers must be restarted in case the test is
-# skipped.
-#
-# ==== Usage ====
-#
-# --source include/force_restart_if_skipped.inc
-#
-# ==== See also ====
-#
-# include/force_restart.inc
-
---let $_force_restart_datadir= `SELECT @@datadir`
---append_file $_force_restart_datadir/mtr/force_restart_if_skipped
-1
-EOF

=== added file 'mysql-test/include/force_restart_if_skipped.inc'
--- a/mysql-test/include/force_restart_if_skipped.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/force_restart_if_skipped.inc	2010-11-29 12:09:17 +0000
@@ -0,0 +1,17 @@
+# ==== Purpose ====
+#
+# Tell mtr that all servers must be restarted in case the test is
+# skipped.
+#
+# ==== Usage ====
+#
+# --source include/force_restart_if_skipped.inc
+#
+# ==== See also ====
+#
+# include/force_restart.inc
+
+--let $_force_restart_datadir= `SELECT @@datadir`
+--append_file $_force_restart_datadir/mtr/force_restart_if_skipped
+1
+EOF

=== modified file 'mysql-test/suite/bugs/t/rpl_bug36391.test'
--- a/mysql-test/suite/bugs/t/rpl_bug36391.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/bugs/t/rpl_bug36391.test	2010-11-30 14:46:37 +0000
@@ -15,8 +15,6 @@
 
 --source include/master-slave.inc
 
-drop table if exists t1;
-
 create table t1(id int);
 
 show tables;

=== modified file 'mysql-test/suite/bugs/t/rpl_bug37426.test'
--- a/mysql-test/suite/bugs/t/rpl_bug37426.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/bugs/t/rpl_bug37426.test	2010-11-30 14:46:37 +0000
@@ -18,5 +18,4 @@ SELECT * FROM char128_utf8;
 sync_slave_with_master;
 
 SELECT * FROM char128_utf8;
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/include/rpl_mixed_ddl.inc'
--- a/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc	2010-11-30 14:46:37 +0000
@@ -80,5 +80,4 @@ sync_slave_with_master;
 # the files your self to see what is not matching
 
 --diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/include/rpl_mixed_dml.inc'
--- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc	2010-11-30 14:46:37 +0000
@@ -340,5 +340,4 @@ sync_slave_with_master;
 # the files your self to see what is not matching
 
 --diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_slave.sql
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result	2010-11-30 14:46:37 +0000
@@ -429,6 +429,7 @@ c1	c4	c5	c6	c7
 4	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
 5	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
 6	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
+DROP TABLE t14a;
 *** connect to master and drop columns ***
 ALTER TABLE t14 DROP COLUMN c2;
 ALTER TABLE t14 DROP COLUMN c4;
@@ -445,7 +446,7 @@ c1	c3	c5	c6	c7
 2	This Test Should work	JOE	1	CURRENT_TIMESTAMP
 3	If is does not, I will open a bug	QA	1	CURRENT_TIMESTAMP
 *** Drop t14  ***
-DROP TABLE t14, t14a;
+DROP TABLE t14;
 *** Create t15 on slave  ***
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result	2010-11-30 14:46:37 +0000
@@ -429,6 +429,7 @@ c1	c4	c5	c6	c7
 4	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
 5	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
 6	b1b1b1b1b1b1b1b1	NULL	1	CURRENT_TIMESTAMP
+DROP TABLE t14a;
 *** connect to master and drop columns ***
 ALTER TABLE t14 DROP COLUMN c2;
 ALTER TABLE t14 DROP COLUMN c4;
@@ -445,7 +446,7 @@ c1	c3	c5	c6	c7
 2	This Test Should work	JOE	1	CURRENT_TIMESTAMP
 3	If is does not, I will open a bug	QA	1	CURRENT_TIMESTAMP
 *** Drop t14  ***
-DROP TABLE t14, t14a;
+DROP TABLE t14;
 *** Create t15 on slave  ***
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2010-11-30 14:46:37 +0000
@@ -50,7 +50,8 @@ a
 [on slave]
 ---- Wait until slave stops with an error ----
 include/wait_for_slave_sql_error.inc [errno=1032]
-Last_SQL_Error = Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_KEY_NOT_FOUND; the event's master log master-bin.000001, end_log_pos 983 (expected "can't find record" error)
+Last_SQL_Error (expected "duplicate key" error)
+Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_KEY_NOT_FOUND; the event's master log master-bin.000001, end_log_pos END_LOG_POS
 SELECT * FROM t1;
 a
 ---- Resolve the conflict on the slave and restart SQL thread ----

=== modified file 'mysql-test/suite/rpl/t/rpl_deadlock_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test	2010-11-30 14:46:37 +0000
@@ -1,6 +1,3 @@
-################################
-# Wrapper for rpl_deadlock.test#
-################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=innodb;

=== modified file 'mysql-test/suite/rpl/t/rpl_do_grant.test'
--- a/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-11-16 16:08:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-11-30 14:46:37 +0000
@@ -346,7 +346,6 @@ DROP USER foo@"1.2.3.4";
 
 --echo 
 --echo # Bug#27606 GRANT statement should be replicated with DEFINER information
-
 --source include/rpl_reset.inc
 --connection master
 GRANT SELECT, INSERT ON mysql.user TO user_bug27606@localhost;

=== modified file 'mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test	2010-11-30 14:46:37 +0000
@@ -4,5 +4,4 @@
 
 let $engine_type = 'InnoDB';
 -- source extra/rpl_tests/rpl_extra_col_slave.test
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test'
--- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test	2010-11-30 14:46:37 +0000
@@ -3,5 +3,4 @@
 
 let $engine_type = 'MyISAM';
 -- source extra/rpl_tests/rpl_extra_col_slave.test
-
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_failed_optimize.test'
--- a/mysql-test/suite/rpl/t/rpl_failed_optimize.test	2010-10-06 12:47:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_failed_optimize.test	2010-11-29 12:09:17 +0000
@@ -1,12 +1,4 @@
-#######################################
-# Wrapper for rpl_failed_optimize.test#
-#######################################
-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=InnoDB;
 -- source extra/rpl_tests/rpl_failed_optimize.test
---source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test	2010-11-30 14:46:37 +0000
@@ -1,6 +1,3 @@
-###################################
-# Wrapper for rpl_foreign_key.test#
-###################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=INNODB;

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test'
--- a/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test	2010-11-30 14:46:37 +0000
@@ -6,5 +6,4 @@
 --source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 let $engine_type= innodb;
-
 --source suite/rpl/include/rpl_mixed_ddl.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test'
--- a/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test	2010-11-30 14:46:37 +0000
@@ -6,5 +6,4 @@
 --source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 let $engine_type= innodb;
-
 --source suite/rpl/include/rpl_mixed_dml.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_loaddata.test'
--- a/mysql-test/suite/rpl/t/rpl_loaddata.test	2010-11-16 16:08:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loaddata.test	2010-11-30 14:46:37 +0000
@@ -1,7 +1,3 @@
-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_binlog_format_statement.inc
 

=== modified file 'mysql-test/suite/rpl/t/rpl_relay_space_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test	2010-11-30 14:46:37 +0000
@@ -1,16 +1,3 @@
-###################################
-# Wrapper rpl_sv_relay_space.test #
-# This test has to be wrapped as  #
-# It tests ndb, innodb and MyISAM.#
-# By Wrapping we are saving some  #
-# space and making the test more  #
-# Maintainable by only having one #
-# test file and reusing the code  #
-# In Addition, INNODB has to have #
-# Option files during this test   #
-# to force innodb on the slave    #
-# else the test will fail         #
-###################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=InnoDB;

=== modified file 'mysql-test/suite/rpl/t/rpl_relay_space_myisam.test'
--- a/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test	2010-11-30 14:46:37 +0000
@@ -1,16 +1,3 @@
-###################################
-# Wrapper rpl_sv_relay_space.test #
-# This test has to be wrapped as  #
-# It tests ndb, innodb and MyISAM.#
-# By Wrapping we are saving some  #
-# space and making the test more  #
-# Maintainable by only having one #
-# test file and reusing the code  #
-# In Addition, INNODB has to have #
-# Option files during this test   #
-# to force innodb on the slave    #
-# else the test will fail         #
-###################################
 -- source include/not_ndb_default.inc
 let $engine_type=MyISAM;
 -- source extra/rpl_tests/rpl_sv_relay_space.test

=== modified file 'mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test	2010-11-30 14:46:37 +0000
@@ -1,6 +1,3 @@
-#################################
-# Wrapper for rpl_row_sp002.test#
-#################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=INNODB;

=== modified file 'mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test	2010-11-30 14:46:37 +0000
@@ -1,6 +1,3 @@
-#################################
-# Wrapper for rpl_row_sp007.test#
-#################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
 let $engine_type=INNODB;

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_conflicts.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_conflicts.test	2010-10-06 12:47:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_conflicts.test	2010-11-29 12:09:17 +0000
@@ -1,8 +1,3 @@
-# See the top of mysql-test/extra/rpl_tests/rpl_conflicts.test for an
-# explanation of what this test does.
-#
-# This test file is for statement-logging mode.
-
 source include/have_binlog_format_mixed_or_statement.inc;
 source include/master-slave.inc;
 

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_multi_query.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_multi_query.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test	2010-11-30 14:46:37 +0000
@@ -3,6 +3,5 @@
 # CLIENT_MULTI_STATEMENTS) will be binlogged ONE-query-per-event (not
 # one binlog event containing all queries)
 
-# Requires statement logging
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source extra/rpl_tests/rpl_multi_query.test

=== modified file 'mysql-test/suite/rpl/t/rpl_truncate_3innodb.test'
--- a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test	2010-11-29 12:12:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test	2010-11-30 14:46:37 +0000
@@ -1,5 +1,4 @@
 --source include/have_innodb.inc
 --source include/not_ndb_default.inc
-
 let $engine=InnoDB;
 --source extra/rpl_tests/rpl_truncate.test

=== modified file 'mysql-test/suite/rpl/t/rpl_variables.test'
--- a/mysql-test/suite/rpl/t/rpl_variables.test	2010-11-16 16:08:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_variables.test	2010-11-30 14:46:37 +0000
@@ -680,6 +680,8 @@ EXECUTE p61; EXECUTE p62; EXECUTE p63; E
 # Show the result in table test.tstmt on master...
 SELECT * FROM tstmt ORDER BY id;
 
+--sync_slave_with_master
+
 # ... then compare test.tstmt on master to the other tables on master and slave.
 let $diff_tables= master:tstmt, master:tproc, master:tfunc, master:ttrig, master:tprep,  slave:tstmt, slave:tproc, slave:tfunc, slave:ttrig, slave:tprep;
 source include/diff_tables.inc;

=== modified file 'mysql-test/suite/rpl/t/rpl_variables_stm.test'
--- a/mysql-test/suite/rpl/t/rpl_variables_stm.test	2010-11-16 16:08:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_variables_stm.test	2010-11-30 14:46:37 +0000
@@ -580,6 +580,8 @@ EXECUTE p61; EXECUTE p62; EXECUTE p63; E
 # Show the result in table test.tstmt on master...
 SELECT * FROM tstmt ORDER BY id;
 
+--sync_slave_with_master
+
 # ... then compare test.tstmt on master to the other tables on master and slave.
 let $diff_tables= master:tstmt, master:tproc, master:tfunc, master:ttrig, master:tprep, slave:tstmt, slave:tproc, slave:tfunc, slave:ttrig, slave:tprep;
 source include/diff_tables.inc;

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-5.5-bugteam branch (sven.sandberg:3135) Bug#49978Sven Sandberg30 Nov