|
|||||||||||
|
bk commit into 5.0 tree (aelkin:1.2526) BUG#26000
From: Andrei Elkin <aelkin(at)mysql.com>
Date: Wed Sep 26 2007 - 15:59:35 EDT
ChangeSet@1.2526, 2007-09-26 21:59:17+02:00, aelkin@koti.dsl.inet.fi +1 -0 Bug #26000 SHOW SLAVE STATUS can crash mysqld during shutdown process
active_mi has been reset (shutdown) at the time of quering with
SHOW SLAVE STATUS so that
Fixed with checking the value of active_mi before to call show_master_info() Merely send_ok() is invoked when active_mi does not exist. A test can not be easiely written. Notice, there are more analogical cases in the code which require a similar treatment (to be reported as a bug separately). sql/sql_parse.cc@1.636, 2007-09-26 21:59:11+02:00, aelkin@koti.dsl.inet.fi +10 -1 Ignore reporting and send only OK if master info struct has been destoyed. As this must be at shutdown merely a warning is sent to the client. diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc 2007-08-05 05:53:13 +02:00
+++ b/sql/sql_parse.cc 2007-09-26 21:59:11 +02:00
@@ -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);
- res = show_master_info(thd,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;
} -- MySQL Code Commits Mailing List For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.comReceived on Wed Sep 26 16:00:46 2007 This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 09:40:45 EDT |
||||||||||
|
|||||||||||