diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-17 10:18:04 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-17 10:18:04 -0700 |
| commit | a1cd28e2e54d32dc70280875bab7f0d35e9370c4 (patch) | |
| tree | ceb810aa1bd2619efec70cb60d4adbac05e35a42 /libmysqld | |
| parent | 0e7410a154560486ce4e0c975f122a0b15853bb1 (diff) | |
| parent | 43fe53acc225a2cea07188d142c1c0f8364cc43b (diff) | |
| download | mariadb-git-a1cd28e2e54d32dc70280875bab7f0d35e9370c4.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 12f93f22d31..c33f08abeee 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -604,7 +604,7 @@ int init_embedded_server(int argc, char **argv, char **groups) // FIXME initialize binlog_filter and rpl_filter if not already done // corresponding delete is in clean_up() if(!binlog_filter) binlog_filter = new Rpl_filter; - if(!rpl_filter) rpl_filter = new Rpl_filter; + if(!global_rpl_filter) global_rpl_filter = new Rpl_filter; if (opt_init_file) { |