diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-16 10:56:22 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-16 10:56:22 -0400 |
| commit | 0aab7b87f9c01200319a54a5921a8b6a93e711d0 (patch) | |
| tree | 7f1b655339eca010a0e9a37f10ca012d403f2bf4 /sql/ha_partition.cc | |
| parent | 47ed8cec46a489447e6d07f63faf382722333748 (diff) | |
| parent | ca1831fa13784b8093a9df0ecf1c227d0790b61c (diff) | |
| download | mariadb-git-0aab7b87f9c01200319a54a5921a8b6a93e711d0.tar.gz | |
Merge dator5.(none):/home/pappa/bug21357
into dator5.(none):/home/pappa/bug21388
sql/ha_partition.cc:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 715f74db849..b43a423575d 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); } |