bk commit into 5.1 tree (elliot:1.2159) BUG#17521

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2159 06/02/23 23:20:29 elliot@stripped +3 -0
  BUG#17521 alter database crashes slave
  Problem was a null pointer
  Fixed by passing correct database name to slave filtering mechanism
  Added test.

  sql/sql_parse.cc
    1.523 06/02/23 23:20:20 elliot@stripped +3 -3
    Fix slave crash when issuing 'ALTER DATABASE' with specifying db name
    Don't pass null pointer to db_ok_with_wild_table()

  mysql-test/t/rpl_alter_db.test
    1.1 06/02/23 23:17:23 elliot@stripped +10 -0

  mysql-test/t/rpl_alter_db.test
    1.0 06/02/23 23:17:23 elliot@stripped +0 -0
    BitKeeper file
/home/emurphy/src/mysql/bk-clean/mysql-5.1-release/mysql-test/t/rpl_alter_db.test

  mysql-test/r/rpl_alter_db.result
    1.1 06/02/23 23:16:56 elliot@stripped +8 -0

  mysql-test/r/rpl_alter_db.result
    1.0 06/02/23 23:16:56 elliot@stripped +0 -0
    BitKeeper file
/home/emurphy/src/mysql/bk-clean/mysql-5.1-release/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:	elliot
# Host:	xan.(none)
# Root:	/home/emurphy/src/mysql/bk-clean/mysql-5.1-release

--- 1.522/sql/sql_parse.cc	2006-02-15 11:12:20 -05:00
+++ 1.523/sql/sql_parse.cc	2006-02-23 23:20:20 -05:00
@@ -3715,7 +3715,7 @@
     }
     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 @@
     */
 #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/23 23:16:56
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/23 23:17:23
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;