Commit 20e5e1d2 authored by unknown's avatar unknown
Browse files

BUG#25890 put previous fix in better place

parent 915c9f4d

libmysqld/lib_sql.cc

+5 −5
Original line number Diff line number Diff line
@@ -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;

}