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. --- sql/tztime.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sql/tztime.cc') diff --git a/sql/tztime.cc b/sql/tztime.cc index a9db91668bb..ccd5ed4a86b 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2687,9 +2687,7 @@ main(int argc, char **argv) char **default_argv; MY_INIT(argv[0]); - if (load_defaults("my",load_default_groups,&argc,&argv)) - exit(1); - + load_defaults_or_exit("my", load_default_groups, &argc, &argv); default_argv= argv; if ((handle_options(&argc, &argv, my_long_options, get_one_option))) -- cgit v1.2.1