diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-10-09 19:52:34 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-10-09 19:52:34 +0300 |
| commit | c05fc9fa31e97a5028beb2c2b43e7d88caf6d49d (patch) | |
| tree | de0ff70013c9d281184769ad1bd49dbac071e039 /sql | |
| parent | 9909173b4a48af8c86f100982cfc6bcb9ef1ad26 (diff) | |
| download | mariadb-git-c05fc9fa31e97a5028beb2c2b43e7d88caf6d49d.tar.gz | |
ha_innobase.cc:
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
sql/ha_innobase.cc:
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innobase.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 620573aa581..13912ad5919 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -3552,6 +3552,14 @@ innodb_show_status( DBUG_ENTER("innodb_show_status"); + if (innodb_skip) { + + fprintf(stderr, + "Cannot call SHOW INNODB STATUS because skip-innodb is defined\n"); + + DBUG_RETURN(-1); + } + /* We let the InnoDB Monitor to output at most 100 kB of text, add a safety margin of 10 kB for buffer overruns */ |