diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 21:41:02 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 21:41:02 -0400 |
| commit | ec0e1a1b2bb6b797da01c082b8a36b97b8d6ed20 (patch) | |
| tree | a35b38db0cb01e4d7a973ad2dc76a71aae12afc0 /sql/partition_info.cc | |
| parent | b19c1896adea1166adb8e80552ac3abfa7642205 (diff) | |
| parent | 60be734e52dfa96aa4cec371d1b41c2ba1efcbb8 (diff) | |
| download | mariadb-git-ec0e1a1b2bb6b797da01c082b8a36b97b8d6ed20.tar.gz | |
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/partition_info.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index edd8f56d8c4..59cedc884b6 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -442,9 +442,11 @@ 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) + if (engine_array[0] == &myisammrg_hton || + engine_array[0] == &tina_hton) { - my_error(ER_PARTITION_MERGE_ERROR, MYF(0)); + my_error(ER_PARTITION_MERGE_ERROR, MYF(0), + engine_array[0] == &myisammrg_hton ? "MyISAM Merge" : "CSV"); DBUG_RETURN(TRUE); } DBUG_RETURN(FALSE); |