Commit 9461b611 authored by aelkin/elkin@koti.dsl.inet.fi's avatar aelkin/elkin@koti.dsl.inet.fi
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26000_show_slave_status_when_no_active_mi
parents 5efd35b0 5dc3fbf1

sql/sql_parse.cc

+10 −1
Original line number Diff line number Diff line
@@ -2844,7 +2844,16 @@ mysql_execute_command(THD *thd) 
    if (check_global_access(thd, SUPER_ACL | REPL_CLIENT_ACL))

      goto error;

    pthread_mutex_lock(&LOCK_active_mi);

    if (active_mi != NULL)

    {

      res = show_master_info(thd, active_mi);

    }

    else

    {

      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,

                   "the master info structure does not exist");

      send_ok(thd);

    }

    pthread_mutex_unlock(&LOCK_active_mi);

    break;

  }