Commit eed990d6 authored by unknown's avatar unknown
Browse files

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

parent 419ca715

client/mysqladmin.c

+18 −3
Original line number Diff line number Diff line
@@ -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))

  {

    unsigned int err= mysql_errno(&mysql);

    if (err >= CR_MIN_ERROR && err <= CR_MAX_ERROR)

      error= 1;

    else

    {

    error = 0;

      /* 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

  {

    while (!interrupted && (!opt_count_iterations || nr_iterations))

    {

      new_line = 0;