diff options
| author | bell@sanja.is.com.ua <> | 2004-10-22 09:51:20 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-10-22 09:51:20 +0300 |
| commit | b1617371d20e0f2da6367cf8b0f1c909979091bc (patch) | |
| tree | 63ed1b249c904afc7cd4046b592b8cb55cbacef8 /sql/ha_innodb.cc | |
| parent | 4c605cece962ea25201a0e6a6c0df9a077ce4cbb (diff) | |
| parent | 42d6d6765a907e049f496fb9b42dc22752ac329b (diff) | |
| download | mariadb-git-b1617371d20e0f2da6367cf8b0f1c909979091bc.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 222e2b4ce8a..547acb63766 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4821,7 +4821,7 @@ ha_innobase::external_lock( Implements the SHOW INNODB STATUS command. Sends the output of the InnoDB Monitor to the client. */ -int +bool innodb_show_status( /*===============*/ THD* thd) /* in: the MySQL query thread of the caller */ @@ -4835,7 +4835,7 @@ innodb_show_status( my_message(ER_NOT_SUPPORTED_YET, "Cannot call SHOW INNODB STATUS because skip-innodb is defined", MYF(0)); - DBUG_RETURN(-1); + DBUG_RETURN(TRUE); } trx = check_trx_exists(thd); @@ -4864,7 +4864,7 @@ innodb_show_status( if (!(str = my_malloc(flen + 1, MYF(0)))) { mutex_exit_noninline(&srv_monitor_file_mutex); - DBUG_RETURN(-1); + DBUG_RETURN(TRUE); } rewind(srv_monitor_file); @@ -4881,7 +4881,7 @@ innodb_show_status( my_free(str, MYF(0)); - DBUG_RETURN(-1); + DBUG_RETURN(TRUE); } protocol->prepare_for_resend(); @@ -4889,10 +4889,10 @@ innodb_show_status( my_free(str, MYF(0)); if (protocol->write()) - DBUG_RETURN(-1); + DBUG_RETURN(TRUE); send_eof(thd); - DBUG_RETURN(0); + DBUG_RETURN(FALSE); } /**************************************************************************** |