bk commit into 5.0 tree (jimw:1.2096) BUG#18607

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.2096 06/04/21 18:26:39 jimw@stripped +1 -0
  Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database
  
    Simply exclude INFORMATION_SCHEMA from LOAD DATA FROM MASTER just like
    we exclude the `mysql` database.
  
    There's no test for this, because it requires an unfiltered 'LOAD DATA
    FROM MASTER' which is too likely to cause chaos (such as when running
    the test suite against an external server).

  sql/repl_failsafe.cc
    1.61 06/04/21 18:26:36 jimw@stripped +2 -1
    Exclude information_schema from LOAD DATA FROM MASTER.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-18607

--- 1.60/sql/repl_failsafe.cc	2006-01-03 08:54:36 -08:00
+++ 1.61/sql/repl_failsafe.cc	2006-04-21 18:26:36 -07:00
@@ -860,7 +860,8 @@
 
       if (!db_ok(db, replicate_do_db, replicate_ignore_db) ||
           !db_ok_with_wild_table(db) ||
-	  !strcmp(db,"mysql"))
+	  !strcmp(db,"mysql") ||
+          is_schema_db(db))
       {
 	*cur_table_res = 0;
 	continue;