bk commit into 5.0 tree (stewart:1.2266) BUG#19914

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-16 17:41:29+10:00, stewart@willster.(none) +2 -0
  BUG#19914 	SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
  
  update federated for fix

  sql/ha_federated.cc@stripped, 2006-10-16 17:41:26+10:00, stewart@willster.(none) +3 -3
    update federated for ::info returning int

  sql/ha_federated.h@stripped, 2006-10-16 17:41:27+10:00, stewart@willster.(none) +1 -1
    update federated for ::info returning int

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

--- 1.68/sql/ha_federated.cc	2006-10-16 17:41:33 +10:00
+++ 1.69/sql/ha_federated.cc	2006-10-16 17:41:33 +10:00
@@ -2385,7 +2385,7 @@
 
 */
 
-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 @@
   if (result)
     mysql_free_result(result);
 
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 
 error:
   if (result)
@@ -2472,7 +2472,7 @@
   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);
 }
 
 

--- 1.27/sql/ha_federated.h	2006-10-16 17:41:33 +10:00
+++ 1.28/sql/ha_federated.h	2006-10-16 17:41:33 +10:00
@@ -285,7 +285,7 @@
   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);