From: Date: February 23 2006 10:16pm
Subject: bk commit into 5.1 tree (elliot:1.2167) BUG#17521
List-Archive: http://lists.mysql.com/commits/3086
X-Bug: 17521
Message-Id: <20060223211618.5E2B9205270@localhost.localdomain>

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.2167 06/02/23 16:15:59 elliot@stripped +1 -0
  BUG#17521: alter database crashes slave
  Problem was a null pointer.
  Fixed by passing correct database name to slave filtering mechanism.

  sql/sql_parse.cc
    1.523 06/02/23 16:15:54 elliot@stripped +2 -2
    Fix slave crash when issuing 'ALTER DATABASE', don't
    pass null pointer to db_ok_with_wild_table()

# 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-new

--- 1.522/sql/sql_parse.cc	2006-02-15 11:12:20 -05:00
+++ 1.523/sql/sql_parse.cc	2006-02-23 16:15:54 -05: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;