From 84129fb1b52a0631f05ba193f464665c5b369e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 16 Mar 2018 14:35:42 +0200 Subject: After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9a The merge only covered 10.1 up to commit 4d248974e00eb915a2fc433cc6b2fb5146281594. Actually merge the changes up to commit 0a534348c75cf435d2017959855de2efa798fd0b. Also, remove the unused InnoDB field trx_t::abort_type. --- client/mysqlcheck.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'client/mysqlcheck.c') diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index d3bb5c48837..45ad2612d44 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -1166,9 +1166,7 @@ int main(int argc, char **argv) /* ** Check out the args */ - if (load_defaults("my", load_default_groups, &argc, &argv)) - goto end2; - + load_defaults_or_exit("my", load_default_groups, &argc, &argv); defaults_argv= argv; if (get_options(&argc, &argv)) goto end1; @@ -1244,7 +1242,6 @@ int main(int argc, char **argv) my_free(shared_memory_base_name); mysql_library_end(); free_defaults(defaults_argv); - end2: my_end(my_end_arg); return ret; } /* main */ -- cgit v1.2.1