database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-amerge
This commit is contained in:
ingo/mydev@chilla.local
2006-07-24 10:05:17 +02:00
parent dbaba24c5b 50b630ba7c
commit 8bb8069653
7 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -5108,9 +5108,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
ha_resolve_storage_engine_name(old_db_type),
ha_resolve_storage_engine_name(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);