Commit 46152464 authored by unknown's avatar unknown
Browse files

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

sql/ha_federated.cc

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ void ha_federated::info(uint flag) 
  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);

}

sql/ha_federated.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ class ha_federated: public handler 
  int rnd_next(byte *buf);                                      //required

  int rnd_pos(byte *buf, byte *pos);                            //required

  void position(const byte *record);                            //required

  void info(uint);                                              //required

  int info(uint);                                              //required



  void update_auto_increment(void);

  int repair(THD* thd, HA_CHECK_OPT* check_opt);