summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimw@mysql.com <>2006-04-21 18:26:39 -0700
committerjimw@mysql.com <>2006-04-21 18:26:39 -0700
commit99b2d44c9c72d393f9fc330f73a855da728b1a56 (patch)
tree2a73f7d07c772b72b8e3846507058a059e2ac44b
parent4b21910b0d3570867dbce473c4d8bbd7454d4423 (diff)
downloadmariadb-git-99b2d44c9c72d393f9fc330f73a855da728b1a56.tar.gz
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).
-rw-r--r--sql/repl_failsafe.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 5cdd24afba4..21e46e71825 100644
--- 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;