Commit d423e558 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents c9cc8bae efaf8c74

mysql-test/r/rpl_ignore_table.result

+1 −1
Original line number Diff line number Diff line
@@ -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 ''

mysql-test/t/rpl_ignore_table.test

+7 −1
Original line number Diff line number Diff line
@@ -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;



#