Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
This commit is contained in:
commit
d6aea04c5b
8
mysql-test/r/rpl_alter_db.result
Normal file
8
mysql-test/r/rpl_alter_db.result
Normal file
@ -0,0 +1,8 @@
|
||||
stop slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
reset master;
|
||||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
use mysql;
|
||||
alter database collate latin1_bin;
|
10
mysql-test/t/rpl_alter_db.test
Normal file
10
mysql-test/t/rpl_alter_db.test
Normal file
@ -0,0 +1,10 @@
|
||||
source include/master-slave.inc;
|
||||
connection master;
|
||||
use mysql; # to be different from initial `test' db of mysqltest client
|
||||
alter database collate latin1_bin;
|
||||
save_master_pos;
|
||||
|
||||
connection slave;
|
||||
sync_with_master;
|
||||
|
||||
|
@ -3715,7 +3715,7 @@ end_with_restore_list:
|
||||
}
|
||||
if (!strip_sp(db) || check_db_name(db))
|
||||
{
|
||||
my_error(ER_WRONG_DB_NAME, MYF(0), lex->name);
|
||||
my_error(ER_WRONG_DB_NAME, MYF(0), db);
|
||||
break;
|
||||
}
|
||||
/*
|
||||
@ -3727,8 +3727,8 @@ end_with_restore_list:
|
||||
*/
|
||||
#ifdef HAVE_REPLICATION
|
||||
if (thd->slave_thread &&
|
||||
(!rpl_filter->db_ok(lex->name) ||
|
||||
!rpl_filter->db_ok_with_wild_table(lex->name)))
|
||||
(!rpl_filter->db_ok(db) ||
|
||||
!rpl_filter->db_ok_with_wild_table(db)))
|
||||
{
|
||||
my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user