diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-08-19 09:20:17 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-08-19 09:20:17 +0200 |
| commit | dd9329761ae48e3d8518f882d1ca12737a4165d0 (patch) | |
| tree | 72efe88e960570085ec2600eb8ec226958a3a255 /sql/ha_partition.cc | |
| parent | 9d6811502ed22f7b4aa99e2be1d5c8ac45792790 (diff) | |
| parent | b7ad17d06a31e0ca8b8ef771e8ba3fcd8b534b32 (diff) | |
| download | mariadb-git-dd9329761ae48e3d8518f882d1ca12737a4165d0.tar.gz | |
merge
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index a87c7fbf7b8..624ef1aff5b 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2403,9 +2403,14 @@ bool ha_partition::get_from_handler_file(const char *name, MEM_ROOT *mem_root) tot_partition_words= (m_tot_parts + 3) / 4; engine_array= (handlerton **) my_alloca(m_tot_parts * sizeof(handlerton*)); for (i= 0; i < m_tot_parts; i++) + { engine_array[i]= ha_resolve_by_legacy_type(ha_thd(), (enum legacy_db_type) - *(uchar *) ((file_buffer) + 12 + i)); + *(uchar *) ((file_buffer) + + 12 + i)); + if (!engine_array[i]) + goto err3; + } address_tot_name_len= file_buffer + 12 + 4 * tot_partition_words; tot_name_words= (uint4korr(address_tot_name_len) + 3) / 4; if (len_words != (tot_partition_words + tot_name_words + 4)) |