bk commit into 5.1 tree (lars:1.2086) BUG#17339

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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
  1.2086 06/02/13 19:03:12 lars@stripped +28 -0
  BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup
is done on slave
  For this particular bug report it was rpl_loadfile.test that did not make proper
cleanup, but the patch
  includes fixes for other tests aswell.

  mysql-test/t/rpl_sp004.test
    1.2 06/02/13 19:02:48 lars@stripped +6 -6
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_sp.test
    1.16 06/02/13 19:02:45 lars@stripped +2 -9
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_slave_status.test
    1.8 06/02/13 19:02:44 lars@stripped +23 -2
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_skip_error.test
    1.9 06/02/13 19:02:42 lars@stripped +8 -1
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_trig002.test
    1.3 06/02/13 19:02:39 lars@stripped +3 -4
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_trig001.test
    1.3 06/02/13 19:02:36 lars@stripped +3 -2
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp012.test
    1.2 06/02/13 19:02:32 lars@stripped +2 -2
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp011.test
    1.2 06/02/13 19:02:30 lars@stripped +4 -8
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp010.test
    1.2 06/02/13 19:02:28 lars@stripped +2 -3
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp009.test
    1.3 06/02/13 19:02:26 lars@stripped +2 -4
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp008.test
    1.2 06/02/13 19:02:24 lars@stripped +3 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp005.test
    1.3 06/02/13 19:02:23 lars@stripped +4 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_sp001.test
    1.3 06/02/13 19:02:22 lars@stripped +2 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_func002.test
    1.2 06/02/13 19:02:22 lars@stripped +2 -3
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_row_func001.test
    1.2 06/02/13 19:02:21 lars@stripped +2 -1
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_redirect.test
    1.15 06/02/13 19:02:21 lars@stripped +3 -1
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_ndb_basic.test
    1.2 06/02/13 19:02:20 lars@stripped +1 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_multi_update4.test
    1.2 06/02/13 19:02:20 lars@stripped +4 -3
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_loadfile.test
    1.3 06/02/13 19:02:19 lars@stripped +3 -1
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_loaddata_s.test
    1.14 06/02/13 19:02:19 lars@stripped +5 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_loaddata_m.test
    1.19 06/02/13 19:02:18 lars@stripped +3 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_loaddata2.test
    1.3 06/02/13 19:02:15 lars@stripped +6 -6
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_ignore_table.test
    1.2 06/02/13 19:02:13 lars@stripped +2 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_drop_temp.test
    1.9 06/02/13 19:02:12 lars@stripped +3 -0
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/t/rpl_LD_INFILE.test
    1.3 06/02/13 19:02:09 lars@stripped +4 -3
    Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done
on slave

  mysql-test/r/rpl_slave_status.result
    1.6 06/02/13 19:02:09 lars@stripped +1 -0
    Cleanup

  mysql-test/r/rpl_redirect.result
    1.16 06/02/13 19:02:04 lars@stripped +0 -1
    Cleanup

  mysql-test/r/rpl_loaddata2.result
    1.3 06/02/13 19:02:03 lars@stripped +1 -0
    Cleanup

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-bug17339

--- 1.1/mysql-test/t/rpl_ignore_table.test	2006-01-26 11:51:31 +01:00
+++ 1.2/mysql-test/t/rpl_ignore_table.test	2006-02-13 19:02:13 +01:00
@@ -23,6 +23,8 @@
 sync_slave_with_master;
 SELECT * FROM t4;
 
+# Cleanup
 connection master;
 DROP TABLE t1;
 DROP TABLE t4;
+sync_slave_with_master;

--- 1.1/mysql-test/t/rpl_multi_update4.test	2006-01-26 11:47:59 +01:00
+++ 1.2/mysql-test/t/rpl_multi_update4.test	2006-02-13 19:02:20 +01:00
@@ -15,7 +15,7 @@
 drop database if exists d2;
 --enable_warnings
 
-### Test
+### Do on master
 
 connection master;
 create database d1;      # accepted by slave
@@ -30,15 +30,16 @@
 update t1 join t2 using (id) set t1.id = 0;
 insert into d1.t0 values (0); # replication works
 
+### Check on slave
+
 sync_slave_with_master;
 use d1;
-#connection slave;
 select * from t0 where id=0;  # must find
 
 ### Clean-up
 connection master;
 drop database d1;
 drop database d2;
-
+sync_slave_with_master;
 
 # End of test

--- 1.15/mysql-test/t/rpl_sp.test	2006-02-02 21:20:17 +01:00
+++ 1.16/mysql-test/t/rpl_sp.test	2006-02-13 19:02:45 +01:00
@@ -429,17 +429,10 @@
 SELECT * FROM t1;
 
 sync_slave_with_master;
-connection slave;
-
 SELECT * FROM t1;
 
-# Cleanup.
-
+# Cleanup
 connection master;
-
 DROP PROCEDURE p1;
-
-# cleanup
-connection master;
 drop table t1;
-reset master;
+sync_slave_with_master;

--- 1.8/mysql-test/t/rpl_drop_temp.test	2006-02-07 13:25:33 +01:00
+++ 1.9/mysql-test/t/rpl_drop_temp.test	2006-02-13 19:02:12 +01:00
@@ -18,7 +18,10 @@
 connection slave;
 --real_sleep 3 # time for DROP to be written
 show status like 'Slave_open_temp_tables';
+
+# Cleanup
 connection default;
 drop database mysqltest;
+sync_slave_with_master;
 
 # End of 4.1 tests

--- 1.18/mysql-test/t/rpl_loaddata_m.test	2006-02-07 20:54:34 +01:00
+++ 1.19/mysql-test/t/rpl_loaddata_m.test	2006-02-13 19:02:18 +01:00
@@ -42,8 +42,11 @@
 SELECT COUNT(*) FROM mysqltest.t1;
 
 #show binlog events;
+
+# Cleanup
 connection master;
 DROP DATABASE mysqltest;
 DROP TABLE test.t1;
+sync_slave_with_master;
 
 # End of test

--- 1.13/mysql-test/t/rpl_loaddata_s.test	2006-02-07 20:54:35 +01:00
+++ 1.14/mysql-test/t/rpl_loaddata_s.test	2006-02-13 19:02:19 +01:00
@@ -22,3 +22,8 @@
 select count(*) from test.t1; # check that LOAD was replicated
 --replace_column 2 # 5 #
 show binlog events from 102; # should be nothing
+
+# Cleanup
+connection master;
+drop table test.t1;
+sync_slave_with_master;

--- 1.2/mysql-test/r/rpl_loaddata2.result	2006-01-17 19:41:19 +01:00
+++ 1.3/mysql-test/r/rpl_loaddata2.result	2006-02-13 19:02:03 +01:00
@@ -150,3 +150,4 @@
 Abernathy
 aberrant
 aberration
+drop table t1;

--- 1.2/mysql-test/t/rpl_LD_INFILE.test	2006-02-02 22:41:20 +01:00
+++ 1.3/mysql-test/t/rpl_LD_INFILE.test	2006-02-13 19:02:09 +01:00
@@ -27,11 +27,12 @@
 sync_slave_with_master;
 connection slave;
 SELECT * FROM test.t1 ORDER BY a DESC;
-connection master;
-# Lets cleanup
-#show binlog events;
 
+# Cleanup
+#show binlog events;
+connection master;
 DROP TABLE test.t1;
+sync_slave_with_master;
 
 # End of 5.0 test case
 

--- 1.2/mysql-test/t/rpl_loaddata2.test	2006-01-17 19:40:47 +01:00
+++ 1.3/mysql-test/t/rpl_loaddata2.test	2006-02-13 19:02:15 +01:00
@@ -4,11 +4,11 @@
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 SELECT * FROM t1 ORDER BY word;
 sync_slave_with_master;
-SELECT * FROM t1 ORDER BY word;
 
-##########
-# Change Author: JBM
-# Change Date: 2006-01-16
-# Change: Added Order by for NDB
-##########
+# Check
+SELECT * FROM t1 ORDER BY word;
 
+# Cleanup
+connection master;
+drop table t1;
+sync_slave_with_master;

--- 1.2/mysql-test/t/rpl_loadfile.test	2006-01-17 19:44:38 +01:00
+++ 1.3/mysql-test/t/rpl_loadfile.test	2006-02-13 19:02:19 +01:00
@@ -40,8 +40,10 @@
 connection slave;
 SELECT * FROM test.t1 ORDER BY blob_column;
 
-# Lets cleanup
+# Cleanup
 connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE test.t1;
+sync_slave_with_master;
+
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_func001.test	2005-12-22 06:35:02 +01:00
+++ 1.2/mysql-test/t/rpl_row_func001.test	2006-02-13 19:02:21 +01:00
@@ -48,9 +48,10 @@
 #Used for debugging
 #show binlog events;
 
-# Lets cleanup
+# Cleanup
 
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_func002.test	2005-12-22 06:35:02 +01:00
+++ 1.2/mysql-test/t/rpl_row_func002.test	2006-02-13 19:02:22 +01:00
@@ -87,10 +87,10 @@
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > ./var/tmp/func002_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info test > ./var/tmp/func002_slave.sql
 
-# First lets cleanupi
+# Cleanup
 DROP FUNCTION test.f1;
 DROP TABLE test.t1;
-
+sync_slave_with_master;
 
 # the test will show that the diff statement failed and no reject file
 # will be created. You will need to go to the mysql-test dir and diff
@@ -98,7 +98,6 @@
 # in mysql-test/var/tmp
 
 exec diff ./var/tmp/func002_master.sql ./var/tmp/func002_slave.sql;
-
 
 # End of 5.0 test case
 

--- 1.2/mysql-test/t/rpl_row_sp001.test	2006-02-03 20:37:30 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp001.test	2006-02-13 19:02:22 +01:00
@@ -124,10 +124,12 @@
 
 # First lets cleanup
 
+connection master;
 DROP PROCEDURE test.p1;
 DROP PROCEDURE test.p2;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
+sync_slave_with_master;
 
 # Lets compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file

--- 1.2/mysql-test/t/rpl_row_sp005.test	2006-02-08 21:13:30 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp005.test	2006-02-13 19:02:23 +01:00
@@ -97,10 +97,14 @@
 ALTER PROCEDURE test.p1 MODIFIES SQL DATA;
 #show binlog events;
 
+# Cleanup
+
+connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 DROP TABLE IF EXISTS test.t3;
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_sp008.test	2005-12-22 06:35:04 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp008.test	2006-02-13 19:02:24 +01:00
@@ -51,8 +51,11 @@
 --replace_result $VERSION VERSION
 show binlog events;
 
+# Cleanup
 
+connection master;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP TABLE IF EXISTS test.t1;
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.2/mysql-test/t/rpl_row_sp009.test	2006-02-08 21:19:11 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp009.test	2006-02-13 19:02:26 +01:00
@@ -94,14 +94,12 @@
 sync_with_master;
 SELECT * FROM test.t2 ORDER BY a;
 
-
+# Cleanup
 connection master;
 #show binlog events;
-# lets cleanup
-
 DROP PROCEDURE test.p1;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
-
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_sp010.test	2005-12-22 06:35:05 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp010.test	2006-02-13 19:02:28 +01:00
@@ -66,16 +66,15 @@
 sync_with_master;
 SELECT * FROM test.t2;
 
+# Cleanup
 connection master;
 #show binlog events;
-# lets cleanup
-
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP PROCEDURE IF EXISTS test.p3;
 DROP PROCEDURE IF EXISTS test.p4;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
-
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_sp011.test	2005-12-22 06:35:05 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp011.test	2006-02-13 19:02:30 +01:00
@@ -78,15 +78,13 @@
 #SELECT * FROM test.t2;
 sync_slave_with_master;
 #SELECT * FROM test.t2;
-connection master;
-
-#show binlog events;
-# lets cleanup
 
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > ./var/tmp/sp011_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info test > ./var/tmp/sp011_slave.sql
 
-
+# Cleanup
+connection master;
+#show binlog events;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP PROCEDURE IF EXISTS test.p3;
@@ -96,9 +94,7 @@
 DROP PROCEDURE IF EXISTS test.p7;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
-
-
-# First lets cleanup
+sync_slave_with_master;
 
 # Lets compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file

--- 1.1/mysql-test/t/rpl_row_sp012.test	2005-12-22 06:35:05 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp012.test	2006-02-13 19:02:32 +01:00
@@ -61,14 +61,14 @@
 CALL test.p3();
 CALL test.p2();
 
+# Cleanup
 connection master;
-
-# lets cleanup
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p3;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
+sync_slave_with_master;
 
 # End of 5.0 test case
 

--- 1.2/mysql-test/t/rpl_row_trig001.test	2006-02-10 10:18:36 +01:00
+++ 1.3/mysql-test/t/rpl_row_trig001.test	2006-02-13 19:02:36 +01:00
@@ -78,8 +78,8 @@
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > ./var/tmp/trig001_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info test > ./var/tmp/trig001_slave.sql
 
-# First lets cleanup
-
+# Cleanup
+connection master;
 DROP PROCEDURE test.p2;
 DROP PROCEDURE test.p3;
 DROP TRIGGER test.t2_ai;
@@ -87,6 +87,7 @@
 DROP TABLE test.t1;
 DROP TABLE test.t2;
 DROP TABLE test.t3;
+sync_slave_with_master;
 
 # Lets compare. Note: If they match test will pass, if they do not match
 # the test will show that the diff statement failed and not reject file

--- 1.2/mysql-test/t/rpl_row_trig002.test	2006-02-07 22:08:00 +01:00
+++ 1.3/mysql-test/t/rpl_row_trig002.test	2006-02-13 19:02:39 +01:00
@@ -67,15 +67,14 @@
 connection slave;
 sync_with_master;
 SELECT * FROM test.t1 ORDER BY id;
-connection master;
 
+# Cleanup
+connection master;
 #show binlog events; 
-
-# cleanup
-
 DROP TRIGGER test.t2_ai;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
 DROP TABLE test.t3;
+sync_slave_with_master;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_sp004.test	2005-12-22 06:35:06 +01:00
+++ 1.2/mysql-test/t/rpl_sp004.test	2006-02-13 19:02:48 +01:00
@@ -75,21 +75,21 @@
 SELECT * FROM test.t1;
 SELECT * FROM test.t2;
 #SELECT * FROM test.t3;
-connection master;
-#show binlog events;
-
-
-# If the test fails, you will need to diff the dumps to see why.
 
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info
test > ./var/tmp/sp004_master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert
--no-create-info test > ./var/tmp/sp004_slave.sql
 
+# Cleanup
+connection master;
+#show binlog events;
 DROP PROCEDURE IF EXISTS test.p1;
 DROP PROCEDURE IF EXISTS test.p2;
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 DROP TABLE IF EXISTS test.t3;
-#sync_slave_with_master;
+sync_slave_with_master;
+
+# If the test fails, you will need to diff the dumps to see why.
 
 -- exec diff ./var/tmp/sp004_master.sql ./var/tmp/sp004_slave.sql
 

--- 1.5/mysql-test/r/rpl_slave_status.result	2006-01-26 17:54:27 +01:00
+++ 1.6/mysql-test/r/rpl_slave_status.result	2006-02-13 19:02:09 +01:00
@@ -53,3 +53,4 @@
 Master_SSL_Key	
 Seconds_Behind_Master	NULL
 drop table t1;
+drop table t1;

--- 1.7/mysql-test/t/rpl_slave_status.test	2006-01-26 17:54:28 +01:00
+++ 1.8/mysql-test/t/rpl_slave_status.test	2006-02-13 19:02:44 +01:00
@@ -1,11 +1,21 @@
-# Test case for BUG #10780
 --source include/master-slave.inc
+
+############################################################################
+# Test case for BUG#10780
+#
+# REQUIREMENT
+#   A slave without replication privileges should have Slave_IO_Running = No
+
+# 1. Create new replication user
 connection master;
 grant replication slave on *.* to rpl@stripped identified by 'rpl';
+
 connection slave;
 stop slave;
 change master to master_user='rpl',master_password='rpl';
 start slave;
+
+# 2. Do replication as new user
 connection master;
 --disable_warnings
 drop table if exists t1;
@@ -16,12 +26,19 @@
 connection slave;
 sync_with_master;
 select * from t1;
+
+# 3. Delete new replication user
 connection master;
 delete from mysql.user where user='rpl';
 flush privileges;
 connection slave;
+
+# 4. Restart slave without privileges
+# (slave.err will contain access denied error for this START SLAVE command)
 stop slave;
 start slave;
+
+# 5. Make sure Slave_IO_Running = No
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 # Column 1 is replaced, since the output can be either
 # "Connecting to master" or "Waiting for master update"
@@ -29,8 +46,12 @@
 --vertical_results
 show slave status;
 
+# Cleanup (Note that slave IO thread is not running)
+connection slave;
+drop table t1;
 connection master;
 drop table t1;
-sync_with_master;
+
+# end of test case for BUG#10780
 
 # end of 4.1 tests

--- 1.15/mysql-test/r/rpl_redirect.result	2006-02-03 20:20:17 +01:00
+++ 1.16/mysql-test/r/rpl_redirect.result	2006-02-13 19:02:04 +01:00
@@ -39,4 +39,3 @@
 4
 5
 drop table t1;
-drop table t1;

--- 1.14/mysql-test/t/rpl_redirect.test	2006-02-03 20:20:02 +01:00
+++ 1.15/mysql-test/t/rpl_redirect.test	2006-02-13 19:02:21 +01:00
@@ -38,8 +38,10 @@
 SELECT * FROM t1 ORDER BY n;
 connection slave;
 SELECT * FROM t1 ORDER BY n;
-drop table t1;
+
+# Cleanup
 connection master;
 drop table t1;
+sync_slave_with_master;
 
 # End of 4.1 tests

--- 1.8/mysql-test/t/rpl_skip_error.test	2006-02-08 16:52:26 +01:00
+++ 1.9/mysql-test/t/rpl_skip_error.test	2006-02-13 19:02:42 +01:00
@@ -1,6 +1,7 @@
 ##########################################
 # 2006-02-07 By JBM: Added order by
 #########################################
+# Note that errors are ignored by opt file.
 source include/master-slave.inc;
 
 create table t1 (n int not null primary key);
@@ -9,14 +10,20 @@
 sync_with_master;
 insert into t1 values (1);
 connection master;
+# Here we expect (ignored) error, since 1 is already in slave table 
 insert into t1 values (1);
+
+# These should work fine
 insert into t1 values (2),(3);
+
 save_master_pos;
 connection slave;
 sync_with_master;
 select * from t1 ORDER BY n;
 
+# Cleanup
 connection master;
 drop table t1;
-sync_with_master;
+sync_slave_with_master;
+
 # End of 4.1 tests

--- 1.1/mysql-test/t/rpl_ndb_basic.test	2006-01-12 19:50:45 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_basic.test	2006-02-13 19:02:20 +01:00
@@ -144,3 +144,4 @@
 # cleanup
 --connection master
 DROP TABLE t1;
+sync_slave_with_master;