diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-02 12:56:48 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-02 12:56:48 -0500 |
| commit | e9f6b35391d569c43a4ea37f1fee559b4145db43 (patch) | |
| tree | e413a97551e047b1e3283ddae589b0753cef01ef | |
| parent | f7f69043ac98d11ddeb124b9944ff369aa5f766f (diff) | |
| download | mariadb-git-e9f6b35391d569c43a4ea37f1fee559b4145db43.tar.gz | |
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().
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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()) |