Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 72add4d3aa4..9c92866f5a9 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.