diff options
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 3e8ad9bb78b..3210eb0675e 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -443,8 +443,7 @@ bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts) DBUG_RETURN(TRUE); } } while (++i < no_parts); - if (engine_array[0] == myisammrg_hton || - engine_array[0] == tina_hton) + if (engine_array[0]->flags & HTON_NO_PARTITION) { my_error(ER_PARTITION_MERGE_ERROR, MYF(0), engine_array[0] == myisammrg_hton ? "MyISAM Merge" : "CSV"); |