diff options
| author | unknown <elliot@mysql.com> | 2006-02-23 23:21:53 -0500 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-02-23 23:21:53 -0500 |
| commit | 760de195eb960179025974633fbd82683e9a04b7 (patch) | |
| tree | 1190089c468c3bf8605e0af6b674be0ae23aec77 | |
| parent | 9805bd76f648fadb86a7cc4c66af500d5197b0df (diff) | |
| parent | c6ee60933db6149bceffd7b670fd806c5f4ec6a7 (diff) | |
| download | mariadb-git-760de195eb960179025974633fbd82683e9a04b7.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
| -rw-r--r-- | mysql-test/r/rpl_alter_db.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/rpl_alter_db.test | 10 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 6 |
3 files changed, 21 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_alter_db.result b/mysql-test/r/rpl_alter_db.result new file mode 100644 index 00000000000..6edbe5d427f --- /dev/null +++ b/mysql-test/r/rpl_alter_db.result @@ -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; diff --git a/mysql-test/t/rpl_alter_db.test b/mysql-test/t/rpl_alter_db.test new file mode 100644 index 00000000000..5ac8a2f4018 --- /dev/null +++ b/mysql-test/t/rpl_alter_db.test @@ -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; + + diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b84eb1cfcb8..e4bbcfc5074 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; |