bk commit into 5.1 tree (msvensson:1.2555)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2007-04-03 11:36:33+02:00, msvensson@stripped +8 -0
  Cleanup tables created by test cases 

  mysql-test/r/crash_commit_before.result@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +1 -0
    Cleanup

  mysql-test/r/rpl_ignore_table.result@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +1 -0
    Cleanup

  mysql-test/r/rpl_packet.result@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +2 -0
    Cleanup

  mysql-test/r/rpl_ssl.result@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +2 -0
    Cleanup

  mysql-test/t/crash_commit_before.test@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +3 -0
    Cleanup

  mysql-test/t/rpl_ignore_table.test@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +3 -0
    Cleanup

  mysql-test/t/rpl_packet.test@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +6 -0
    Cleanup

  mysql-test/t/rpl_ssl.test@stripped, 2007-04-03 11:36:31+02:00, msvensson@stripped +6 -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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.4/mysql-test/r/rpl_packet.result	2007-03-16 15:25:15 +01:00
+++ 1.5/mysql-test/r/rpl_packet.result	2007-04-03 11:36:31 +02:00
@@ -24,3 +24,5 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaa
 SHOW STATUS LIKE 'Slave_running';
 Variable_name	Value
 Slave_running	OFF
+drop table t1;
+drop table t1;

--- 1.4/mysql-test/t/rpl_packet.test	2007-03-16 15:25:15 +01:00
+++ 1.5/mysql-test/t/rpl_packet.test	2007-04-03 11:36:31 +02:00
@@ -68,5 +68,11 @@ connection slave; 
 sleep 2;
 SHOW STATUS LIKE 'Slave_running';
 
+# cleanup
+connection master;
+drop table t1;
+connection slave;
+drop table t1;
+
 
 # End of tests

--- 1.5/mysql-test/r/rpl_ignore_table.result	2007-04-03 08:04:23 +02:00
+++ 1.6/mysql-test/r/rpl_ignore_table.result	2007-04-03 11:36:31 +02:00
@@ -121,6 +121,7 @@ delete from mysql.user where user like "
 delete from mysql.db where user like "mysqltest%";
 delete from mysql.columns_priv where user like "mysqltest%";
 delete from mysql.tables_priv where user like "mysqltest%";
+delete from mysql.tables_priv where user like "mysqltest%";
 DROP TABLE IF EXISTS t5;
 CREATE TABLE t5 (
 word varchar(50) collate utf8_unicode_ci NOT NULL default ''

--- 1.6/mysql-test/t/rpl_ignore_table.test	2007-04-03 08:04:23 +02:00
+++ 1.7/mysql-test/t/rpl_ignore_table.test	2007-04-03 11:36:31 +02:00
@@ -136,6 +136,9 @@ delete from mysql.tables_priv where user
 
 connection master;
 
+#BUG27606
+delete from mysql.tables_priv where user like "mysqltest%";
+
 #
 # bug#22877 replication character sets get out of sync
 # using replicate-wild-ignore-table

--- 1.1/mysql-test/r/crash_commit_before.result	2006-07-20 13:23:41 +02:00
+++ 1.2/mysql-test/r/crash_commit_before.result	2007-04-03 11:36:31 +02:00
@@ -11,3 +11,4 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SELECT * FROM t1;
 a
+DROP TABLE t1;

--- 1.5/mysql-test/t/crash_commit_before.test	2006-12-28 06:42:02 +01:00
+++ 1.6/mysql-test/t/crash_commit_before.test	2007-04-03 11:36:31 +02:00
@@ -30,3 +30,6 @@ COMMIT;
 SHOW CREATE TABLE t1;
 
 SELECT * FROM t1;
+
+
+DROP TABLE t1;

--- 1.4/mysql-test/r/rpl_ssl.result	2007-03-29 16:11:01 +02:00
+++ 1.5/mysql-test/r/rpl_ssl.result	2007-04-03 11:36:31 +02:00
@@ -93,3 +93,5 @@ Master_SSL_Cipher	
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
+drop user replssl@localhost;
+drop table t1;

--- 1.2/mysql-test/t/rpl_ssl.test	2007-03-08 19:57:15 +01:00
+++ 1.3/mysql-test/t/rpl_ssl.test	2007-04-03 11:36:31 +02:00
@@ -58,3 +58,9 @@ sync_slave_with_master;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
 query_vertical show slave status;
+
+connection master;
+drop user replssl@localhost;
+drop table t1;
+sync_slave_with_master;
+