bk commit into 5.1 tree (stewart:1.2314) BUG#19914

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 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-18 22:31:48+10:00, stewart@willster.(none) +2 -0
  BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
  
  update partition engine for handler::info returning int

  sql/ha_partition.cc@stripped, 2006-10-18 22:31:45+10:00, stewart@willster.(none) +2 -2
    update for handler::info returning int.

  sql/ha_partition.h@stripped, 2006-10-18 22:31:45+10:00, stewart@willster.(none) +1 -1
    update for handler::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.1/bug19914-mk2-merge

--- 1.77/sql/ha_partition.cc	2006-10-18 22:31:54 +10:00
+++ 1.78/sql/ha_partition.cc	2006-10-18 22:31:54 +10:00
@@ -4214,7 +4214,7 @@
       retrieving statistics data.
 */
 
-void ha_partition::info(uint flag)
+int ha_partition::info(uint flag)
 {
   handler *file, **file_array;
   DBUG_ENTER("ha_partition:info");
@@ -4378,7 +4378,7 @@
 	stats.update_time= file->stats.update_time;
     } while (*(++file_array));
   }
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 }
 
 

--- 1.28/sql/ha_partition.h	2006-10-18 22:31:54 +10:00
+++ 1.29/sql/ha_partition.h	2006-10-18 22:31:54 +10:00
@@ -449,7 +449,7 @@
     purposes.
     -------------------------------------------------------------------------
   */
-  virtual void info(uint);
+  virtual int info(uint);
   void get_dynamic_partition_info(PARTITION_INFO *stat_info,
                                   uint part_id);
   virtual int extra(enum ha_extra_function operation);