diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-23 18:20:04 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-23 18:20:04 -0700 |
| commit | 8bfec4b2626e460429812d9cd7147d6359a9ebea (patch) | |
| tree | 3e844287d28e04b956e290ea0a046809417ae376 /sql | |
| parent | 84762ce2cb01d352858dfff14afa9debffd14d8a (diff) | |
| download | mariadb-git-8bfec4b2626e460429812d9cd7147d6359a9ebea.tar.gz | |
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:
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index fa68da87661..2d2007c8fdd 100644 --- 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(); + } } /**************************************************************************** |