From a4208cdc1ca13b6d7e0821b49a9523f9af5fb6d5 Mon Sep 17 00:00:00 2001 From: "df@kahlann.erinye.com" <> Date: Sat, 27 Jan 2007 21:26:28 +0100 Subject: [PATCH] BUG#25890 put previous fix in better place --- libmysqld/lib_sql.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 0293f6bf33b..d2de6c103dd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -538,6 +538,11 @@ int init_embedded_server(int argc, char **argv, char **groups) sql_print_error("Warning: Can't create thread to manage maintenance"); } + // 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 (opt_init_file) { if (read_init_file(opt_init_file)) @@ -547,11 +552,6 @@ 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; - execute_ddl_log_recovery(); return 0; }