mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

After-merge fix for commit 98eb9518db

Browse source 
The merge only covered 10.1 up to
commit 4d248974e0.

Actually merge the changes up to
commit 0a534348c7.

Also, remove the unused InnoDB field trx_t::abort_type.
This commit is contained in:
Marko Mäkelä 2018-03-16 14:35:42 +02:00
commit 84129fb1b5
36 changed files with 176 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/archive/archive_reader.c
View file

@ -408,8 +408,7 @@ static void print_version(void)
static void get_options(int *argc, char ***argv)
{
if (load_defaults("my", load_default_groups, argc, argv))
exit(1);
load_defaults_or_exit("my", load_default_groups, argc, argv);
default_argv= *argv;
handle_options(argc, argv, my_long_options, get_one_option);