Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc

2 files changed, 5 insertions, 4 deletions

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 02241dd92f6..94f3ab210d6 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -19323,7 +19323,9 @@ int main(int argc, char **argv)
 
   MY_INIT(argv[0]);
 
-  load_defaults("my", client_test_load_default_groups, &argc, &argv);
+  if (load_defaults("my", client_test_load_default_groups, &argc, &argv))
+    exit(1);
+
   defaults_argv= argv;
   get_options(&argc, &argv);
 
diff --git a/tests/thread_test.c b/tests/thread_test.c
index 760b72fc5d1..def133f4a3f 100644
--- a/tests/thread_test.c
+++ b/tests/thread_test.c
@@ -176,9 +176,8 @@ static void get_options(int argc, char **argv)
 {
   int ho_error;
 
-  load_defaults("my",load_default_groups,&argc,&argv);
-
-  if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+  if ((ho_error= load_defaults("my",load_default_groups,&argc,&argv)) ||
+      (ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
     exit(ho_error);
 
   free_defaults(argv);