diff options
| author | unknown <mskold@linux.site> | 2006-06-14 13:45:27 +0200 |
|---|---|---|
| committer | unknown <mskold@linux.site> | 2006-06-14 13:45:27 +0200 |
| commit | 9df1f3859702e993e940bd32deed931506766ba5 (patch) | |
| tree | 7219e987756ec6e127fcd26ca200159c93f7c83e /sql/sql_table.cc | |
| parent | de253b63597b943e17ef9481046018da5f310d18 (diff) | |
| parent | 0795b20b625e1df969e29585b70ed3e57e130203 (diff) | |
| download | mariadb-git-9df1f3859702e993e940bd32deed931506766ba5.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/marty/MySQL/mysql-5.1
sql/mysqld.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a49b7a2cc42..5bc7e49a40c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4744,6 +4744,13 @@ static uint compare_tables(TABLE *table, List<create_field> *create_list, create_info->row_type != ROW_TYPE_FIXED) create_info->table_options|= HA_OPTION_PACK_RECORD; + /* Check if field was renamed */ + field->flags&= ~FIELD_IS_RENAMED; + if (my_strcasecmp(system_charset_info, + field->field_name, + new_field->field_name)) + field->flags|= FIELD_IS_RENAMED; + /* Evaluate changes bitmap and send to check_if_incompatible_data() */ if (!(tmp= field->is_equal(new_field))) DBUG_RETURN(ALTER_TABLE_DATA_CHANGED); |