Merge polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Auto merged

2 files changed, 6 insertions, 2 deletions

diff --git a/tests/bug25714.c b/tests/bug25714.c
index 4782178e2f2..03d28f59aa4 100644
--- a/tests/bug25714.c
+++ b/tests/bug25714.c
@@ -29,8 +29,12 @@ int main (int argc, char **argv)
 
   MY_INIT(argv[0]);
 
-  if (argc != 2)
+  if (argc != 2 || !strcmp(argv[1], "--help"))
+  {
+    fprintf(stderr, "This program is a part of the MySQL test suite. "
+            "It is not intended to be executed directly by a user.\n");
     return -1;
+  }
 
   mysql_init(&conn);
   if (!mysql_real_connect(
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 8bfe315fb59..b71e8d20a91 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -129,7 +129,7 @@ static void die(const char *file, int line, const char *expr)
   fflush(stdout);
   fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);
   fflush(stderr);
-  abort();
+  exit(1);
 }