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 mysql.com:/home/mydev/mysql-5.1-bug18477

Browse Source 
into  mysql.com:/home/mydev/mysql-5.1-aid


mysql-test/t/innodb.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-06 08:40:38 +02:00
parent 9e3500196c 5569a87ebd
commit 8f2fb4ba90
5 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@ -3796,7 +3796,7 @@ static uint compare_tables(TABLE *table, List<create_field> *create_list,
create_info->used_fields & HA_CREATE_USED_ENGINE ||
create_info->used_fields & HA_CREATE_USED_CHARSET ||
create_info->used_fields & HA_CREATE_USED_DEFAULT_CHARSET ||
(alter_info->flags & ALTER_RECREATE) ||
(alter_info->flags & (ALTER_RECREATE | ALTER_FOREIGN_KEY)) ||
order_num)
DBUG_RETURN(ALTER_TABLE_DATA_CHANGED);