diff options
| author | unknown <brian@zim.(none)> | 2006-09-30 18:31:13 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-09-30 18:31:13 -0700 |
| commit | 40bf7b0ae2b109e677efb5483c30607171a87afe (patch) | |
| tree | 15d38e4ee1d3d583b3ac0f1d863fed3c925d3d95 /sql/partition_info.cc | |
| parent | 76b8386550be1015c0f81bcc3bffe86115aa92c2 (diff) | |
| download | mariadb-git-40bf7b0ae2b109e677efb5483c30607171a87afe.tar.gz | |
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
mysql-test/r/partition.result:
Updated results
sql/ha_ndbcluster.cc:
Updated hton
sql/ha_partition.cc:
Removed need for global internal hton.
sql/handler.cc:
Removed need for global mrg
sql/mysql_priv.h:
Updated needs for global variables.
sql/mysqld.cc:
Removed needs around hton
sql/partition_info.cc:
Removed bug.... aka what happens if tables are neither?
sql/share/errmsg.txt:
Made error message more generic.
sql/sql_cache.cc:
Removed specific hton reference
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); |