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

[magnus.blaudd]

 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
 3499 Martin Skold	2012-05-30
      WL#5534 inplace ALTER TABLE: Adaption to new interface for ndb (from WL#3749): Moved opening of altered table later in binlog thread to get correct write_set, fixes ndb_rpl_add_column

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result	2012-04-20 18:08:31 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result	2012-06-07 12:31:13 +0000
@@ -496,7 +496,7 @@ t1	CREATE TABLE `t1` (
 ) /*!50100 TABLESPACE ts STORAGE DISK */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
 Attributes:
 a1 Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-a2 Float NULL AT=FIXED ST=DISK
+a2 Float NULL AT=FIXED ST=MEMORY
 a3 Double NULL AT=FIXED ST=MEMORY
 a4 Bit(1) NULL AT=FIXED ST=DISK
 a5 Tinyint NULL AT=FIXED ST=DISK

No bundle (reason: useless for push emails).