bk commit into 5.1 tree (df:1.2412) BUG#25890

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-27 21:26:28+01:00, df@stripped +1 -0
  BUG#25890 put previous fix in better place

  libmysqld/lib_sql.cc@stripped, 2007-01-27 21:26:26+01:00, df@stripped +5 -5
    BUG#25890 put previous fix in better place

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.1.15-release

--- 1.129/libmysqld/lib_sql.cc	2007-01-27 20:16:13 +01:00
+++ 1.130/libmysqld/lib_sql.cc	2007-01-27 21:26:26 +01:00
@@ -538,6 +538,11 @@ int init_embedded_server(int argc, char 
       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))
@@ -546,11 +551,6 @@ int init_embedded_server(int argc, char 
       return 1;
     }
   }
-
-  // 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;