Commit 0fa22f5a authored by cmiller@calliope.local's avatar cmiller@calliope.local

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

into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
parents 0cb9cee7 ee120139
...@@ -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