summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-02 12:56:48 -0500
committercmiller@zippy.cornsilk.net <>2007-01-02 12:56:48 -0500
commit0c181b078684a44dd6d64fa4dcbe9aab1a0d8b78 (patch)
treee413a97551e047b1e3283ddae589b0753cef01ef
parent682596d7ce081c6382316f9efa7a8b7e6881bdf2 (diff)
downloadmariadb-git-0c181b078684a44dd6d64fa4dcbe9aab1a0d8b78.tar.gz
Bug#23950: misplaced code in mysqld.cc, main()
We should initialize before anything else.
-rw-r--r--sql/mysqld.cc4
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())