diff options
| author | brian@zim.(none) <> | 2006-09-30 18:31:13 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-09-30 18:31:13 -0700 |
| commit | 56505c01f911d788edc13f099ac99193b92a26c6 (patch) | |
| tree | 15d38e4ee1d3d583b3ac0f1d863fed3c925d3d95 /sql/partition_info.cc | |
| parent | 46ae2113ba8a0d240469ba304b51ebebdd34942c (diff) | |
| download | mariadb-git-56505c01f911d788edc13f099ac99193b92a26c6.tar.gz | |
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
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 3210eb0675e..b3c7c1b80e7 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -445,8 +445,7 @@ bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts) } while (++i < no_parts); if (engine_array[0]->flags & HTON_NO_PARTITION) { - my_error(ER_PARTITION_MERGE_ERROR, MYF(0), - engine_array[0] == myisammrg_hton ? "MyISAM Merge" : "CSV"); + my_error(ER_PARTITION_MERGE_ERROR, MYF(0)); DBUG_RETURN(TRUE); } DBUG_RETURN(FALSE); |