diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
| commit | 745cc74c3301f193c7b82c31d11c3bf0c842be9e (patch) | |
| tree | 4aa6101c051c91607d2623eed26fb41527fd0bd3 /sql/ha_partition.cc | |
| parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
| parent | cc6d22f5356e0969d8d5d1046edc69cb17ea19fb (diff) | |
| download | mariadb-git-745cc74c3301f193c7b82c31d11c3bf0c842be9e.tar.gz | |
5.1.51 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 bde8ff053e7..305f83a25e5 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)) |