Commit 46152464 authored by unknown's avatar unknown

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
parent 62689e18
...@@ -2385,7 +2385,7 @@ int ha_federated::rnd_pos(byte *buf, byte *pos) ...@@ -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 error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char status_buf[FEDERATED_QUERY_BUFFER_SIZE]; char status_buf[FEDERATED_QUERY_BUFFER_SIZE];
...@@ -2463,7 +2463,7 @@ void ha_federated::info(uint flag) ...@@ -2463,7 +2463,7 @@ void ha_federated::info(uint flag)
if (result) if (result)
mysql_free_result(result); mysql_free_result(result);
DBUG_VOID_RETURN; DBUG_RETURN(0);
error: error:
if (result) if (result)
...@@ -2472,7 +2472,7 @@ error: ...@@ -2472,7 +2472,7 @@ error:
my_sprintf(error_buffer, (error_buffer, ": %d : %s", my_sprintf(error_buffer, (error_buffer, ": %d : %s",
mysql_errno(mysql), mysql_error(mysql))); mysql_errno(mysql), mysql_error(mysql)));
my_error(error_code, MYF(0), error_buffer); my_error(error_code, MYF(0), error_buffer);
DBUG_VOID_RETURN; DBUG_RETURN(error_code);
} }
......
...@@ -285,7 +285,7 @@ public: ...@@ -285,7 +285,7 @@ public:
int rnd_next(byte *buf); //required int rnd_next(byte *buf); //required
int rnd_pos(byte *buf, byte *pos); //required int rnd_pos(byte *buf, byte *pos); //required
void position(const byte *record); //required void position(const byte *record); //required
void info(uint); //required int info(uint); //required
void update_auto_increment(void); void update_auto_increment(void);
int repair(THD* thd, HA_CHECK_OPT* check_opt); int repair(THD* thd, HA_CHECK_OPT* check_opt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment