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:
  memcpy was too long m_reorged_parts was already temp_partitions * no_subparts so multiplying
  by no_subparts again was not a good idea.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 615c4bfb1bf..f0c6bdc0301 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1343,9 +1343,9 @@ int ha_partition::change_partitions(HA_CREATE_INFO *create_info,
           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);
   }