bzr push into mysql-trunk-cluster branch (magnus.blaudd:3500 to 3501)

[magnus.blaudd]

 3501 magnus.blaudd@stripped	2012-06-08
      ndb
       - revert MCP for propagating ALTER_COLUMN_ORDER which is already detected
         by comparing the old and new index for a column

    modified:
      sql/sql_table.cc
 3500 magnus.blaudd@stripped	2012-06-07
      ndb
       - revert unintentional change of .result file for ndb_dd_alter which made it
       look liked the column from where an index was dropped did not revert back to
       being stored on DISK
        - compared against 7.2

    modified:
      mysql-test/suite/ndb/r/ndb_dd_alter.result
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2012-05-15 17:27:56 +0000
+++ b/sql/sql_table.cc	2012-06-08 09:09:16 +0000
@@ -5299,9 +5299,6 @@ static bool fill_alter_inplace_info(THD 
   if (alter_info->flags & Alter_info::ALTER_RENAME)
     ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_RENAME;
 
-  if (alter_info->flags & Alter_info::ALTER_COLUMN_ORDER)
-    ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_COLUMN_ORDER;
-
   if (alter_info->flags & Alter_info::ALTER_COLUMN_STORAGE_TYPE)
     ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_COLUMN_STORAGE_TYPE;
   if (alter_info->flags & Alter_info::ALTER_COLUMN_COLUMN_FORMAT)

No bundle (reason: useless for push emails).