From e9f6b35391d569c43a4ea37f1fee559b4145db43 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Jan 2007 12:56:48 -0500 Subject: [PATCH] Bug#23950: misplaced code in mysqld.cc, main() We should initialize before anything else. sql/mysqld.cc: Move MY_INIT to the top of main(). --- sql/mysqld.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 95de1f91ecf..bcae6fd2ec8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3339,8 +3339,10 @@ int win_main(int argc, char **argv) int main(int argc, char **argv) #endif { - DEBUGGER_OFF; MY_INIT(argv[0]); // init my_sys library & pthreads + /* ^^^ Nothing should be before this line! */ + + DEBUGGER_OFF; #ifdef _CUSTOMSTARTUPCONFIG_ if (_cust_check_startup())