List:Commits« Previous MessageNext Message »
From:holyfoot Date:January 29 2007 11:26am
Subject:bk commit into 5.1 tree (holyfoot:1.2412) BUG#25890
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-29 15:26:27+04:00, holyfoot@stripped +1 -0
  bug #25890 (mysqltest_embedded crashes on start)
  
  binlog_filter and rpl_filter are initialized in server's 'main' function
  which doesn't work in the embedded server. So this code moved to
  function working in both cases.

  sql/mysqld.cc@stripped, 2007-01-29 15:26:25+04:00, holyfoot@stripped +8 -8
    rpl_filter/binlog_filter initializations moved to
    init_common_variables() function.
    That will be called by both 'standalone' and 'embedded' servers

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/mysql-5.1.embf

--- 1.610/sql/mysqld.cc	2007-01-29 15:26:32 +04:00
+++ 1.611/sql/mysqld.cc	2007-01-29 15:26:32 +04:00
@@ -2613,6 +2613,14 @@ static int init_common_variables(const c
 
   max_system_variables.pseudo_thread_id= (ulong)~0;
   start_time=time((time_t*) 0);
+  rpl_filter= new Rpl_filter;
+  binlog_filter= new Rpl_filter;
+  if (!rpl_filter || !binlog_filter) 
+  {
+    sql_perror("Could not allocate replication and binlog filters");
+    exit(1);
+  }
+
   if (init_thread_environment())
     return 1;
   mysql_init_variables();
@@ -3472,14 +3480,6 @@ int main(int argc, char **argv)
 {
   MY_INIT(argv[0]);		// init my_sys library & pthreads
   /* nothing should come before this line ^^^ */
-
-  rpl_filter= new Rpl_filter;
-  binlog_filter= new Rpl_filter;
-  if (!rpl_filter || !binlog_filter) 
-  {
-    sql_perror("Could not allocate replication and binlog filters");
-    exit(1);
-  }
 
   /*
     Perform basic logger initialization logger. Should be called after
Thread
bk commit into 5.1 tree (holyfoot:1.2412) BUG#25890holyfoot29 Jan