bk commit into 5.1 tree (mskold:1.2553) BUG#31233

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of mskold.  When mskold 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@stripped, 2008-03-13 08:41:47+01:00, mskold@stripped +1 -0
  ndb_alter_table.result:
    bug#31233 mysql_alter_table() fails to drop UNIQUE KEY: Re-generated result

  mysql-test/suite/ndb/r/ndb_alter_table.result@stripped, 2008-03-13 08:40:58+01:00, mskold@stripped +4 -4
    bug#31233 mysql_alter_table() fails to drop UNIQUE KEY: Re-generated result

diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table.result b/mysql-test/suite/ndb/r/ndb_alter_table.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table.result	2008-03-12 15:30:32 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table.result	2008-03-13 08:40:58 +01:00
@@ -310,7 +310,7 @@ a	b	c
 12	403	NULL
 drop table t1;
 create table t1(a int not null) engine=ndb;
-$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 PRIMARY KEY($PK) - UniqueHashIndex
 insert into t1 values (1),(2),(3);
 alter table t1 add primary key (a);
@@ -324,7 +324,7 @@ a
 3
 17
 alter table t1 drop primary key;
-$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 PRIMARY KEY($PK) - UniqueHashIndex
 update t1 set a = 1 where a = 17;
 select * from t1 order by a;
@@ -334,7 +334,7 @@ a
 3
 drop table t1;
 create table t1(a int not null) engine=ndb;
-$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 PRIMARY KEY($PK) - UniqueHashIndex
 insert into t1 values (1),(2),(3);
 create unique index pk on t1(a);
@@ -347,7 +347,7 @@ a
 3
 17
 alter table t1 drop index pk;
-$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
 PRIMARY KEY($PK) - UniqueHashIndex
 update t1 set a = 1 where a = 17;
 select * from t1 order by a;