diff options
| author | unknown <kostja@bodhi.local> | 2006-07-11 17:04:27 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-11 17:04:27 +0400 |
| commit | 67d53e36cdbcc4cdf5dc785a5f465c1e1bc7fdbe (patch) | |
| tree | 842caa02e2a80d46d098ce7483b09a3802981a99 /sql/sql_table.cc | |
| parent | aedfd072487feaedcbd66784bf514519a242272c (diff) | |
| parent | 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 (diff) | |
| download | mariadb-git-67d53e36cdbcc4cdf5dc785a5f465c1e1bc7fdbe.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
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 41231effdce..4772d64ad0a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3237,9 +3237,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); |