Merge mysql.com:/home/jimw/my/mysql-5.0-18607

into mysql.com:/home/jimw/my/mysql-5.0-clean

Merge mysql.com:/home/jimw/my/mysql-5.0-18607
into mysql.com:/home/jimw/my/mysql-5.0-clean
3dd4fcb3 · unknown · 64a33680 · 661c6aea · 3dd4fcb3
Commit 3dd4fcb3 authored May 01, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/repl_failsafe.cc sql/repl_failsafe.cc +2 -1

No files found.
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -860,7 +860,8 @@ bool load_master_data(THD* thd)

      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;