summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-04-03 08:04:25 +0200
committerunknown <msvensson@pilot.blaudden>2007-04-03 08:04:25 +0200
commitefaf8c748cc1c6ee33f9265fa2f5818f8d5a0682 (patch)
treed0b6a62c22c9fa3ded36733c99d7ecd0476aae01
parentf75f2912b6299afbc88f344b1d5f2c7fe097e25a (diff)
downloadmariadb-git-efaf8c748cc1c6ee33f9265fa2f5818f8d5a0682.tar.gz
Work around for bug#27606
-rw-r--r--mysql-test/r/rpl_ignore_table.result2
-rw-r--r--mysql-test/t/rpl_ignore_table.test8
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_ignore_table.result b/mysql-test/r/rpl_ignore_table.result
index 80cff7c9a1e..9b9146be5a6 100644
--- a/mysql-test/r/rpl_ignore_table.result
+++ b/mysql-test/r/rpl_ignore_table.result
@@ -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 ''
diff --git a/mysql-test/t/rpl_ignore_table.test b/mysql-test/t/rpl_ignore_table.test
index 72fd7f1db72..f678e0a7cc1 100644
--- a/mysql-test/t/rpl_ignore_table.test
+++ b/mysql-test/t/rpl_ignore_table.test
@@ -124,10 +124,16 @@ 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;
#