List:Commits« Previous MessageNext Message »
From:Patrick Galbraith Date:January 6 2006 4:08pm
Subject:bk commit into 5.1 tree (patg:1.2022)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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
  1.2022 06/01/06 08:08:36 patg@stripped +1 -0
  Merge pgalbraith@stripped:/users/rburnett/mysql-5.1-wl2682
  into  govinda.site:/home/patg/mysql-build/mysql-5.1-wl2682

  sql/ha_partition.cc
    1.28 06/01/06 08:08:32 patg@stripped +0 -0
    Auto merged

# 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:	patg
# Host:	govinda.site
# Root:	/home/patg/mysql-build/mysql-5.1-wl2682/RESYNC

--- 1.27/sql/ha_partition.cc	2006-01-06 07:50:58 -08:00
+++ 1.28/sql/ha_partition.cc	2006-01-06 08:08:32 -08:00
@@ -1567,7 +1567,7 @@
 
   DBUG_PRINT("info", ("rnd_init on partition %d", current_partition_index));
 
-  for (i= current_partition_index; i < m_part_info->no_parts; i++)
+  for (i= current_partition_index; i < m_tot_parts; i++)
   {
     if (_bitmap_is_set(&(m_part_info->used_partitions), i))
       if ((error= m_file[i]->ha_rnd_init(scan)))
@@ -3145,17 +3145,16 @@
 
 ha_rows ha_partition::estimate_rows_upper_bound()
 {
-  handler **file;
   ha_rows rows, tot_rows= 0;
+  handler **file;
   DBUG_ENTER("ha_partition::estimate_rows_upper_bound");
 
+  file= m_file;
   do
   {
-    int i= file - m_file;
-    if (_bitmap_is_set(&(m_part_info->used_partitions), i))
+    if (_bitmap_is_set(&(m_part_info->used_partitions), (file - m_file)))
     {
       rows= (*file)->estimate_rows_upper_bound();
-
       if (rows == HA_POS_ERROR)
         DBUG_RETURN(HA_POS_ERROR);
       tot_rows+= rows;
Thread
bk commit into 5.1 tree (patg:1.2022)Patrick Galbraith6 Jan