database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge with 4.0.15

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-09-11 20:24:14 +03:00
parent 45aa92c574 62103fff40
commit 73f66f68fd
33 changed files with 646 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libmysqld/lib_sql.cc
View File

@ -26,7 +26,8 @@
static int fake_argc= 1;
static char *fake_argv[]= {(char *)"", 0};
static const char *fake_groups[] = { "server", "embedded", 0 };
static char inited, org_my_init_done;
static my_bool org_my_init_done;
my_bool server_inited;
#if defined (__WIN__)
#include "../sql/mysqld.cpp"
@ -181,9 +182,9 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups)
/* 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)