diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 4b05dd70e35..b71b442b4ca 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -628,7 +628,10 @@ void STDCALL mysql_server_end()
   copy_arguments_ptr=0;
   clean_up(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);