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

9d39e4a5 · hf@deer.(none) · 30dd658d · 9d39e4a5
Commit 9d39e4a5 authored Jul 28, 2005 by hf@deer.(none)
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +3 -3

No files found.
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -627,14 +627,14 @@ void STDCALL mysql_server_end()
  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);
  if (errorlog_file)
  {
    fclose(errorlog_file);
    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()