diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-16 14:35:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-16 15:49:53 +0200 |
| commit | 84129fb1b52a0631f05ba193f464665c5b369e77 (patch) | |
| tree | 98d4cec4446a5d2ce541438402f5dbf1931b5a63 /sql/tztime.cc | |
| parent | 98eb9518db1da854048b09d94244a982a1d32f9a (diff) | |
| download | mariadb-git-84129fb1b52a0631f05ba193f464665c5b369e77.tar.gz | |
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.
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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))) |