diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-11 13:01:27 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-11 13:01:27 +0200 |
| commit | 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 (patch) | |
| tree | 828a6e191b240ff69b4846a899dbf71b6375ae98 /sql/sql_table.cc | |
| parent | 0859819aae7f1d3a8c784b5468e3cb3187dba64f (diff) | |
| parent | 1a7e4ac0bbe8f87494124bd4ded7fe5e4f99498f (diff) | |
| download | mariadb-git-034522f47dd56dffb4b590ab02d3ab3cdb65b6c8.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-release
into chilla.local:/home/mydev/mysql-5.0-amerge
sql/handler.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 1d69c69b5cf..895c5436f94 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); |