summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authoringo/mydev@chilla.local <>2006-07-10 20:46:05 +0200
committeringo/mydev@chilla.local <>2006-07-10 20:46:05 +0200
commitdfaa3c78f62d63314992363019fcc1c48c509616 (patch)
tree0cbc54a15d93da3ad99331c970b464e151d7564e /sql/sql_table.cc
parentbe5f48268c5dc03b7b506d2dbf603c75c691adc5 (diff)
downloadmariadb-git-dfaa3c78f62d63314992363019fcc1c48c509616.tar.gz
Revoking patch for Bug#10952 on behalf of Brian.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 91c71193df2..a4ac7392cf2 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3240,9 +3240,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
DBUG_PRINT("info", ("old type: %d new type: %d", old_db_type, new_db_type));
if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||
- ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED) ||
- (old_db_type != new_db_type &&
- ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE)))
+ ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
{
DBUG_PRINT("info", ("doesn't support alter"));
my_error(ER_ILLEGAL_HA, MYF(0), table_name);