diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-03 08:05:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-03 08:05:30 +0200 |
| commit | d423e558f5a2980302cd5aa7ed2704a5af584282 (patch) | |
| tree | 597c4cb4a6701bdcf8576c50b8a2e75e635cc85f | |
| parent | c9cc8bae48a8b1f91cbea2c7aa68506689a3387a (diff) | |
| parent | efaf8c748cc1c6ee33f9265fa2f5818f8d5a0682 (diff) | |
| download | mariadb-git-d423e558f5a2980302cd5aa7ed2704a5af584282.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| -rw-r--r-- | mysql-test/r/rpl_ignore_table.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_ignore_table.test | 8 |
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; # |