bk commit into 5.1 tree (aelkin:1.2138) BUG#17265

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2138 06/02/18 22:19:58 aelkin@stripped +3 -0
  BUG#17265 merge time artifact

  mysql-test/t/rpl_alter_db.test
    1.1 06/02/18 22:19:52 aelkin@stripped +12 -0
    Test case mimics bug report's.

  mysql-test/r/rpl_alter_db.result
    1.1 06/02/18 22:19:52 aelkin@stripped +8 -0
    New BitKeeper file ``mysql-test/r/rpl_alter_db.result''

  sql/sql_parse.cc
    1.523 06/02/18 22:19:52 aelkin@stripped +2 -2
    according to the code evolution the bug seems to be
       introduced in time of merging code when do_ok became a method of
       rpl_filter class. ChangeSet 1.1773.1.27 2005/04/19 11:09:54.

  mysql-test/t/rpl_alter_db.test
    1.0 06/02/18 22:19:52 aelkin@stripped +0 -0
    BitKeeper file
/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug17521/mysql-test/t/rpl_alter_db.test

  mysql-test/r/rpl_alter_db.result
    1.0 06/02/18 22:19:52 aelkin@stripped +0 -0
    BitKeeper file
/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug17521/mysql-test/r/rpl_alter_db.result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug17521

--- 1.522/sql/sql_parse.cc	2006-02-15 18:12:20 +02:00
+++ 1.523/sql/sql_parse.cc	2006-02-18 22:19:52 +02:00
@@ -3727,8 +3727,8 @@
     */
 #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;
--- New file ---
+++ mysql-test/r/rpl_alter_db.result	06/02/18 22:19:52
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;

--- New file ---
+++ mysql-test/t/rpl_alter_db.test	06/02/18 22:19:52
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;

# no crash

# End of the tests