bk commit into 5.1 tree (msvensson:1.2553) BUG#27606

[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 08:04:25+02:00, msvensson@stripped +2 -0
  Work around for bug#27606

  mysql-test/r/rpl_ignore_table.result@stripped, 2007-04-03 08:04:23+02:00,
msvensson@stripped +1 -1
    Work around for bug#27606

  mysql-test/t/rpl_ignore_table.test@stripped, 2007-04-03 08:04:23+02:00,
msvensson@stripped +7 -1
    Work around for bug#27606

# 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_ignore_table.result	2007-03-29 14:21:44 +02:00
+++ 1.5/mysql-test/r/rpl_ignore_table.result	2007-04-03 08:04:23 +02:00
@@ -119,8 +119,8 @@ drop table t1, t4, mysqltest2.t2;
 drop database mysqltest2;
 delete from mysql.user where user like "mysqltest%";
 delete from mysql.db where user like "mysqltest%";
-delete from mysql.tables_priv where user like "mysqltest%";
 delete from mysql.columns_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.5/mysql-test/t/rpl_ignore_table.test	2007-03-29 14:35:02 +02:00
+++ 1.6/mysql-test/t/rpl_ignore_table.test	2007-04-03 08:04:23 +02:00
@@ -124,9 +124,15 @@ drop table t1, t4, mysqltest2.t2;
 drop database mysqltest2;
 delete from mysql.user where user like "mysqltest%";
 delete from mysql.db where user like "mysqltest%";
-delete from mysql.tables_priv where user like "mysqltest%";
+#
+# BUG 27606 causes failure to replicate this statement
+# move it to slave instead
+#delete from mysql.tables_priv where user like "mysqltest%";
 delete from mysql.columns_priv where user like "mysqltest%";
 sync_slave_with_master;
+
+#BUG27606
+delete from mysql.tables_priv where user like "mysqltest%";
 
 connection master;