diff options
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2fd6927854f..864adddb9c4 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -42,9 +42,6 @@ C_MODE_START #include "errmsg.h" #include <sql_common.h> -static my_bool org_my_init_done; -my_bool server_inited; - static my_bool emb_advanced_command(MYSQL *mysql, enum enum_server_command command, const char *header, ulong header_length, @@ -305,7 +302,7 @@ extern "C" char ** copy_arguments_ptr= 0; -int STDCALL mysql_server_init(int argc, char **argv, char **groups) +int init_embedded_server(int argc, char **argv, char **groups) { char glob_hostname[FN_REFLEN]; @@ -329,17 +326,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) if (!groups) groups= (char**) fake_groups; - - /* Only call MY_INIT() if it hasn't been called before */ - if (!server_inited) - { - server_inited=1; - org_my_init_done=my_init_done; - } - if (!org_my_init_done) - { - MY_INIT((char *)"mysql_embedded"); // init my_sys library & pthreads - } + my_progname= (char *)"mysql_embedded"; if (init_common_variables("my", *argcp, *argvp, (const char **)groups)) { @@ -438,14 +425,11 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) return 0; } -void STDCALL mysql_server_end() +void end_embedded_server() { my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR)); copy_arguments_ptr=0; clean_up(0); - /* If library called my_init(), free memory allocated by it */ - if (!org_my_init_done) - my_end(0); } } /* extern "C" */ |