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.

10 files changed, 12 insertions, 35 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 9e50bb86933..a13617cc9cb 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1176,11 +1176,7 @@ int main(int argc,char *argv[])
       close(stdout_fileno_copy);             /* Clean up dup(). */
   }
 
-  if (load_defaults("my",load_default_groups,&argc,&argv))
-  {
-    my_end(0);
-    exit(1);
-  }
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
   defaults_argv=argv;
   if ((status.exit_status= get_options(argc, (char **) argv)))
   {
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 14a47bce352..0f153fde158 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -1133,6 +1133,8 @@ int main(int argc, char **argv)
   char self_name[FN_REFLEN + 1];
 
   MY_INIT(argv[0]);
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
+  defaults_argv= argv; /* Must be freed by 'free_defaults' */
 
 #if __WIN__
   if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0)
@@ -1145,10 +1147,6 @@ int main(int argc, char **argv)
       init_dynamic_string(&conn_args, "", 512, 256))
     die("Out of memory");
 
-  if (load_defaults("my", load_default_groups, &argc, &argv))
-    die(NULL);
-  defaults_argv= argv; /* Must be freed by 'free_defaults' */
-
   if (handle_options(&argc, &argv, my_long_options, get_one_option))
     die(NULL);
   if (debug_info_flag)
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index bd80dd01a1e..5e7fb80b2b5 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -320,8 +320,7 @@ int main(int argc,char *argv[])
   MY_INIT(argv[0]);
   mysql_init(&mysql);
   sf_leaking_memory=1; /* don't report memory leaks on early exits */
-  if ((error= load_defaults("my",load_default_groups,&argc,&argv)))
-    goto err1;
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
   save_argv = argv;				/* Save for free_defaults */
 
   if ((error=handle_options(&argc, &argv, my_long_options, get_one_option)))
@@ -501,10 +500,8 @@ err2:
   my_free(shared_memory_base_name);
 #endif
   free_defaults(save_argv);
-err1:
   my_end(my_end_arg);
-  exit(error);
-  return 0;
+  return error;
 }
 
 
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 9d18c45d7a1..9a3a4aaa9eb 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2948,9 +2948,7 @@ int main(int argc, char** argv)
   my_init_time(); // for time functions
   tzset(); // set tzname
 
-  if (load_defaults("my", load_groups, &argc, &argv))
-    exit(1);
-
+  load_defaults_or_exit("my", load_groups, &argc, &argv);
   defaults_argv= argv;
 
   if (!(binlog_filter= new Rpl_filter))
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 */
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 57d087b331b..9a89c805955 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -980,8 +980,7 @@ static int get_options(int *argc, char ***argv)
   opt_net_buffer_length= *mysql_params->p_net_buffer_length;
 
   md_result_file= stdout;
-  if (load_defaults("my",load_default_groups,argc,argv))
-    return 1;
+  load_defaults_or_exit("my", load_default_groups, argc, argv);
   defaults_argv= *argv;
 
   if (my_hash_init(&ignore_table, charset_info, 16, 0, 0,
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 6da14aa1520..02caf2df198 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -643,8 +643,7 @@ int main(int argc, char **argv)
   MY_INIT(argv[0]);
   sf_leaking_memory=1; /* don't report memory leaks on early exits */
 
-  if (load_defaults("my",load_default_groups,&argc,&argv))
-    return 1;
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
   /* argv is changed in the program */
   argv_to_free= argv;
   if (get_options(&argc, &argv))
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 0a761edff4c..65b915655a6 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -72,8 +72,7 @@ int main(int argc, char **argv)
   static char **defaults_argv;
   MY_INIT(argv[0]);
   sf_leaking_memory=1; /* don't report memory leaks on early exits */
-  if (load_defaults("my",load_default_groups,&argc,&argv))
-    exit(1);
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
   defaults_argv=argv;
 
   get_options(&argc,&argv);
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index f0ad2f40abc..05bc9430541 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -325,11 +325,7 @@ int main(int argc, char **argv)
   MY_INIT(argv[0]);
   sf_leaking_memory=1; /* don't report memory leaks on early exits */
 
-  if (load_defaults("my",load_default_groups,&argc,&argv))
-  {
-    my_end(0);
-    exit(1);
-  }
+  load_defaults_or_exit("my", load_default_groups, &argc, &argv);
   defaults_argv=argv;
   if (get_options(&argc,&argv))
   {
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 4003e57226d..6f041e92a32 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7298,9 +7298,7 @@ get_one_option(int optid, const struct my_option *opt, char *argument)
 
 int parse_args(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;
 
   if ((handle_options(&argc, &argv, my_long_options, get_one_option)))