mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
BUG#25890 put previous fix in better place
This commit is contained in:
@ -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");
|
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 (opt_init_file)
|
||||||
{
|
{
|
||||||
if (read_init_file(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();
|
execute_ddl_log_recovery();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user