bk commit - 5.1 tree (mikael:1.2265) BUG#21357

[Mikael Ronström]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2006/08/07 18:33:12-04:00 mikael@dator5.(none)
#   BUG#21357: Valgrind error in partition test
#   memcpy was too long m_reorged_parts was already temp_partitions * 
no_subparts so multiplying
#   by no_subparts again was not a good idea.
#
# sql/ha_partition.cc
#   2006/08/07 18:33:09-04:00 mikael@dator5.(none) +2 -2
#   memcpy was too long m_reorged_parts was already temp_partitions * 
no_subparts so multiplying
#   by no_subparts again was not a good idea.
#
diff -Nru a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2006-08-07 18:37:08 -04:00
+++ b/sql/ha_partition.cc	2006-08-07 18:37:08 -04:00
@@ -1343,9 +1343,9 @@
            ones used to be.
          */
          first= FALSE;
-        DBUG_ASSERT(i + m_reorged_parts <= m_file_tot_parts);
+        DBUG_ASSERT(((i*no_subparts) + m_reorged_parts) <= 
m_file_tot_parts);
          memcpy((void*)m_reorged_file, &m_file[i*no_subparts],
-               sizeof(handler*)*m_reorged_parts*no_subparts);
+               sizeof(handler*)*m_reorged_parts);
        }
      } while (++i < no_parts);
    }

Mikael Ronstrom, Senior Software Architect
MySQL AB, www.mysql.com

Jumpstart your cluster:
http://www.mysql.com/consulting/packaged/cluster.html
My blog:
http://mikaelronstrom.blogspot.com