diff options
| author | unknown <jimw@mysql.com> | 2006-05-01 11:38:15 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-01 11:38:15 -0700 |
| commit | 839a5dea8672091fd5a96cef5dff8934d938884b (patch) | |
| tree | e40a050be0bf936cff10d68680df4bf5d7f5cbea /sql/repl_failsafe.cc | |
| parent | ae75af8cb75ccd088121e1fe3b01a0090a11808b (diff) | |
| parent | 71b3a5aa3549219f4992176483244664f9a72a0f (diff) | |
| download | mariadb-git-839a5dea8672091fd5a96cef5dff8934d938884b.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index e207a0bf633..9cabe1a3df0 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -861,7 +861,8 @@ bool load_master_data(THD* thd) if (!rpl_filter->db_ok(db) || !rpl_filter->db_ok_with_wild_table(db) || - !strcmp(db,"mysql")) + !strcmp(db,"mysql") || + is_schema_db(db)) { *cur_table_res = 0; continue; |