diff options
| author | unknown <stewart@willster.(none)> | 2006-10-16 17:41:29 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-10-16 17:41:29 +1000 |
| commit | 46152464aa27954659a028d625f82acc601b7bbe (patch) | |
| tree | 96ef3b65429aeeebd788827b35779a6697a5db36 /sql/ha_federated.cc | |
| parent | 62689e18e727ecc213770a6e717c576753e9b6c3 (diff) | |
| download | mariadb-git-46152464aa27954659a028d625f82acc601b7bbe.tar.gz | |
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
update federated for fix
sql/ha_federated.cc:
update federated for ::info returning int
sql/ha_federated.h:
update federated for ::info returning int
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 7919519cdce..8be1e40f42d 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -2385,7 +2385,7 @@ int ha_federated::rnd_pos(byte *buf, byte *pos) */ -void ha_federated::info(uint flag) +int ha_federated::info(uint flag) { char error_buffer[FEDERATED_QUERY_BUFFER_SIZE]; char status_buf[FEDERATED_QUERY_BUFFER_SIZE]; @@ -2463,7 +2463,7 @@ void ha_federated::info(uint flag) if (result) mysql_free_result(result); - DBUG_VOID_RETURN; + DBUG_RETURN(0); error: if (result) @@ -2472,7 +2472,7 @@ error: my_sprintf(error_buffer, (error_buffer, ": %d : %s", mysql_errno(mysql), mysql_error(mysql))); my_error(error_code, MYF(0), error_buffer); - DBUG_VOID_RETURN; + DBUG_RETURN(error_code); } |