From d301fa9125bd0928fb5e56968e48f7dd8834f6b9 Mon Sep 17 00:00:00 2001
From: unknown <hf@deer.(none)>
Date: Fri, 21 May 2004 17:23:27 +0500
Subject: [PATCH] Addition to the fix for bug #3791 (libmysqld mysql segfaults
 if can's find errormsg.sys) Cleanups added

client/mysql.cc:
  my_end(0) added to do all the necessary cleanups
  glob_buffer.realloc() moved beneath the mysql_server_init
---
 client/mysql.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index b3b1e35bb85..3cf4a01a9cf 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -371,14 +371,16 @@ int main(int argc,char *argv[])
       !(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin)))
   {
     free_defaults(defaults_argv);
+    my_end(0);
     exit(1);
   }
-  glob_buffer.realloc(512);
   if (mysql_server_init(0, NULL, (char**) server_default_groups))
   {
     free_defaults(defaults_argv);
+    my_end(0);
     exit(1);
   }
+  glob_buffer.realloc(512);
   completion_hash_init(&ht, 128);
   init_alloc_root(&hash_mem_root, 16384, 0);
   bzero((char*) &mysql, sizeof(mysql));