A fix (bug #3120: 'mysqladmin ping' - return error code).

1 files changed, 18 insertions, 3 deletions

diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 3bc11ec0fb0..153fcdde96d 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -246,7 +246,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 
 int main(int argc,char *argv[])
 {
-  int error, ho_error;
+  int error= 0, ho_error;
   MYSQL mysql;
   char **commands, **save_argv;
 
@@ -285,10 +285,25 @@ int main(int argc,char *argv[])
 		  opt_ssl_capath, opt_ssl_cipher);
 #endif
   if (sql_connect(&mysql, option_wait))
-    error = 1;
+  {
+    unsigned int err= mysql_errno(&mysql);
+    if (err >= CR_MIN_ERROR && err <= CR_MAX_ERROR)
+      error= 1;
+    else
+    {
+      /* Return 0 if all commands are PING */
+      for (; argc > 0; argv++, argc--)
+      {
+        if (find_type(argv[0], &command_typelib, 2) != ADMIN_PING)
+        {
+          error= 1;
+          break;
+        }
+      }
+    }
+  }
   else
   {
-    error = 0;
     while (!interrupted && (!opt_count_iterations || nr_iterations))
     {
       new_line = 0;