bk commit into 5.0 tree (tsmith:1.2588) BUG#32083

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith.  When tsmith does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-23 18:20:04-07:00, tsmith@stripped +1 -0
  Applied innodb-5.0-ss2223 snapshot
  
  Fixes:
  
  Bug #32083: server crashes on show status when InnoDB is not initialized
    innodb_export_status(): Check that InnoDB has been initialized
    before invoking srv_export_innodb_status().  (Bug #32083)
    This bug does not exist in MySQL/InnoDB 5.1.

  sql/ha_innodb.cc@stripped, 2008-01-23 18:15:54-07:00, tsmith@stripped +3 -1
    Applied innodb-5.0-ss2223 snapshot
    
    Revision r2223:
    branches/5.0: innodb_export_status(): Check that InnoDB has been initialized
    before invoking srv_export_innodb_status().  (Bug #32083)
    
    This bug does not exist in MySQL/InnoDB 5.1.

diff -Nrup a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc	2007-11-20 10:38:06 -07:00
+++ b/sql/ha_innodb.cc	2008-01-23 18:15:54 -07:00
@@ -6339,7 +6339,9 @@ void
 innodb_export_status(void)
 /*======================*/
 {
-  srv_export_innodb_status();
+	if (innodb_inited) {
+		srv_export_innodb_status();
+	}
 }
 
 /****************************************************************************