bk commit into 5.1 tree (mskold:1.2189)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2189 06/06/14 12:01:06 mskold@stripped +1 -0
  Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

  sql/sql_table.cc
    1.345 06/06/14 11:59:51 mskold@stripped +2 -0
    Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.1

--- 1.344/sql/sql_table.cc	2006-06-14 11:07:41 +02:00
+++ 1.345/sql/sql_table.cc	2006-06-14 11:59:51 +02:00
@@ -4745,10 +4745,12 @@ static uint compare_tables(TABLE *table,
       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);