diff options
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index eddb326f6c4..52ff08b8787 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -306,7 +306,8 @@ char **copy_arguments(int argc, char **argv) extern "C" { -static my_bool inited, org_my_init_done; +static my_bool org_my_init_done; +my_bool server_inited; ulong max_allowed_packet, net_buffer_length; char ** copy_arguments_ptr= 0; @@ -338,9 +339,9 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) my_umask_dir=0700; // Default umask for new directories /* Only call MY_INIT() if it hasn't been called before */ - if (!inited) + if (!server_inited) { - inited=1; + server_inited=1; org_my_init_done=my_init_done; } if (!org_my_init_done) |