Commit 7e7bd6a4 authored by unknown's avatar unknown

Additional fix for #12177 (stderr isn't closed)


libmysqld/lib_sql.cc:
  my_end() needs stderr to be active
parent 153353fd
...@@ -627,14 +627,14 @@ void STDCALL mysql_server_end() ...@@ -627,14 +627,14 @@ void STDCALL mysql_server_end()
my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR)); my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
copy_arguments_ptr=0; copy_arguments_ptr=0;
clean_up(0); clean_up(0);
/* If library called my_init(), free memory allocated by it */
if (!org_my_init_done)
my_end(0);
if (errorlog_file) if (errorlog_file)
{ {
fclose(errorlog_file); fclose(errorlog_file);
errorlog_file=0; errorlog_file=0;
} }
/* If library called my_init(), free memory allocated by it */
if (!org_my_init_done)
my_end(0);
} }
my_bool STDCALL mysql_thread_init() my_bool STDCALL mysql_thread_init()
......
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