From ee120139ab34a8f4ed4105745afd1d4be0348aec Mon Sep 17 00:00:00 2001
From: "cmiller@calliope.local.cmiller/calliope.local" <>
Date: Fri, 29 Dec 2006 16:07:33 -0500
Subject: [PATCH] Bug#23950: misplaced code in mysqld.cc, main()

Moved MY_INIT() to top of main(), where it should be.
---
 sql/mysqld.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d6031504799..eb344f852e2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3476,6 +3476,9 @@ int win_main(int argc, char **argv)
 int main(int argc, char **argv)
 #endif
 {
+  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) 
@@ -3484,8 +3487,6 @@ int main(int argc, char **argv)
     exit(1);
   }
 
-  MY_INIT(argv[0]);		// init my_sys library & pthreads
-
   /*
     Perform basic logger initialization logger. Should be called after
     MY_INIT, as it initializes mutexes. Log tables are inited later.