Merge ramayana.hindu.god:/home/tsmith/m/inno/jan23/50

into ramayana.hindu.god:/home/tsmith/m/bk/build/50

Merge ramayana.hindu.god:/home/tsmith/m/inno/jan23/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
52502879 · tsmith@ramayana.hindu.god · 6dabb0d4 · fa257c03 · 52502879
Commit 52502879 authored Jan 23, 2008 by tsmith@ramayana.hindu.god
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +3 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -6339,7 +6339,9 @@ void
 innodb_export_status(void)
 /*======================*/
 {
-  srv_export_innodb_status();
+	if (innodb_inited) {
+		srv_export_innodb_status();
+	}
 }

 /****************************************************************************