Commit d301fa91 authored by unknown's avatar unknown

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
parent 6bc1a1bf
...@@ -371,14 +371,16 @@ int main(int argc,char *argv[]) ...@@ -371,14 +371,16 @@ int main(int argc,char *argv[])
!(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin))) !(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin)))
{ {
free_defaults(defaults_argv); free_defaults(defaults_argv);
my_end(0);
exit(1); exit(1);
} }
glob_buffer.realloc(512);
if (mysql_server_init(0, NULL, (char**) server_default_groups)) if (mysql_server_init(0, NULL, (char**) server_default_groups))
{ {
free_defaults(defaults_argv); free_defaults(defaults_argv);
my_end(0);
exit(1); exit(1);
} }
glob_buffer.realloc(512);
completion_hash_init(&ht, 128); completion_hash_init(&ht, 128);
init_alloc_root(&hash_mem_root, 16384, 0); init_alloc_root(&hash_mem_root, 16384, 0);
bzero((char*) &mysql, sizeof(mysql)); bzero((char*) &mysql, sizeof(mysql));
......
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