diff options
| author | unknown <stewart@willster.(none)> | 2006-08-10 22:55:20 +0800 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-08-10 22:55:20 +0800 |
| commit | e34496e5d827c774a92891fb8201a53a27564e38 (patch) | |
| tree | eca32a4dab10c05bdc27fdb082459d63c173bbe4 /sql/ha_innodb.cc | |
| parent | bfdbb780c26aae2705cf0d7e3048b5c0e40f59e1 (diff) | |
| download | mariadb-git-e34496e5d827c774a92891fb8201a53a27564e38.tar.gz | |
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
allow handler::info to return an error code (that will be returned to the user)
sql/ha_berkeley.cc:
update handler::info interface to return int
sql/ha_berkeley.h:
update handler::info interface to return int
sql/ha_heap.cc:
update handler::info interface to return int
sql/ha_heap.h:
update handler::info interface to return int
sql/ha_innodb.cc:
update handler::info interface to return int
sql/ha_innodb.h:
update handler::info interface to return int
sql/ha_myisam.cc:
update handler::info interface to return int
sql/examples/ha_archive.cc:
update handler::info interface to return int
sql/examples/ha_archive.h:
update handler::info interface to return int
sql/examples/ha_example.cc:
update handler::info interface to return int
sql/examples/ha_example.h:
update handler::info interface to return int
sql/examples/ha_tina.cc:
update handler::info interface to return int
sql/examples/ha_tina.h:
update handler::info interface to return int
sql/ha_myisam.h:
update handler::info interface to return int
sql/ha_myisammrg.cc:
update handler::info interface to return int
sql/ha_myisammrg.h:
update handler::info interface to return int
sql/ha_ndbcluster.cc:
update handler::info interface to return int
sql/ha_ndbcluster.h:
update handler::info interface to return int
sql/handler.h:
update handler::info interface to return int
sql/opt_sum.cc:
If we get an error when using handler::info to get count(*),
print and return the error.
sql/sql_select.cc:
if error, set fatal error.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 6c93ac293d0..3d1724efb91 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4570,7 +4570,7 @@ ha_innobase::read_time( Returns statistics information of the table to the MySQL interpreter, in various fields of the handle object. */ -void +int ha_innobase::info( /*==============*/ uint flag) /* in: what information MySQL requests */ @@ -4593,7 +4593,7 @@ ha_innobase::info( if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) { - DBUG_VOID_RETURN; + DBUG_RETURN(HA_ERR_CRASHED); } /* We do not know if MySQL can call this function before calling @@ -4758,7 +4758,7 @@ ha_innobase::info( prebuilt->trx->op_info = (char*)""; - DBUG_VOID_RETURN; + DBUG_RETURN(0); } /************************************************************************** |