diff options
| author | unknown <ingo@mysql.com> | 2006-04-06 08:40:38 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-04-06 08:40:38 +0200 |
| commit | 8f2fb4ba902b59fc0aa40a62ae60073b5eafe8ba (patch) | |
| tree | d9ffad49fcff365824dffa226febf0231b8e2505 /sql/sql_table.cc | |
| parent | 9e3500196c5e858c118fe8efec9026288e923c92 (diff) | |
| parent | 5569a87ebd93cff64e9a7b37392c8fb3b1fc60eb (diff) | |
| download | mariadb-git-8f2fb4ba902b59fc0aa40a62ae60073b5eafe8ba.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.1-bug18477
into mysql.com:/home/mydev/mysql-5.1-aid
mysql-test/t/innodb.test:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ed875d321bc..2687b64841f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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); |