Commit d200e8eb authored by unknown's avatar unknown

Bug#23950: misplaced code in mysqld.cc, main()

Moved MY_INIT() to top of main(), where it should be.


sql/mysqld.cc:
  Nothing should come before MY_INIT().
parent e05764a3
...@@ -3476,6 +3476,9 @@ int win_main(int argc, char **argv) ...@@ -3476,6 +3476,9 @@ int win_main(int argc, char **argv)
int main(int argc, char **argv) int main(int argc, char **argv)
#endif #endif
{ {
MY_INIT(argv[0]); // init my_sys library & pthreads
/* nothing should come before this line ^^^ */
rpl_filter= new Rpl_filter; rpl_filter= new Rpl_filter;
binlog_filter= new Rpl_filter; binlog_filter= new Rpl_filter;
if (!rpl_filter || !binlog_filter) if (!rpl_filter || !binlog_filter)
...@@ -3484,8 +3487,6 @@ int main(int argc, char **argv) ...@@ -3484,8 +3487,6 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
MY_INIT(argv[0]); // init my_sys library & pthreads
/* /*
Perform basic logger initialization logger. Should be called after Perform basic logger initialization logger. Should be called after
MY_INIT, as it initializes mutexes. Log tables are inited later. MY_INIT, as it initializes mutexes. Log tables are inited later.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment