bk commit into 6.0 tree (mskold:1.2600)

[Martin Skold]

Below is the list of changes that have just been committed into a local
6.0 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-14 15:48:13+01:00, mskold@stripped +2 -0
  Updated result

  mysql-test/suite/ndb/r/ndb_alter_table.result@stripped, 2008-03-14 15:48:01+01:00, mskold@stripped +44 -8
    Updated result

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@stripped, 2008-03-14 15:48:01+01:00, mskold@stripped +40 -0
    Updated 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-14 13:35:12 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table.result	2008-03-14 15:48:01 +01:00
@@ -309,16 +309,52 @@ select * from t1 where a = 12;
 a	b	c
 12	403	NULL
 drop table t1;
-create table t1 (a int not null, b varchar(10)) engine=ndb;
-show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+create table t1(a int not null) engine=ndb;
+$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);
-show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
-t1	0	PRIMARY	1	a	A	0	NULL	NULL		BTREE		
+a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+PRIMARY KEY(a) - UniqueHashIndex
+PRIMARY(a) - OrderedIndex
+update t1 set a = 17 where a = 1;
+select * from t1 order by a;
+a
+2
+3
+17
 alter table t1 drop primary key;
-show index from t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+$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;
+a
+1
+2
+3
+drop table t1;
+create table t1(a int not null) engine=ndb;
+$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);
+a Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+PRIMARY KEY(a) - UniqueHashIndex
+update t1 set a = 17 where a = 1;
+select * from t1 order by a;
+a
+2
+3
+17
+alter table t1 drop index pk;
+$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;
+a
+1
+2
+3
 drop table t1;
 create table t1 (a int not null primary key, b int not null default 0, c varchar(254)) engine=ndb;
 show create table t1;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_alter_table_online.result b/mysql-test/suite/ndb/r/ndb_alter_table_online.result
--- a/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2008-03-14 13:36:16 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_online.result	2008-03-14 15:48:01 +01:00
@@ -472,6 +472,46 @@ name
 truncate ndb_show_tables_results;
 DROP TABLE t1;
 ****************************************
+* Adding dropping primary key
+****************************************
+CREATE TABLE t1 (a INT UNSIGNED NOT NULL) ENGINE NDB;
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
+PRIMARY KEY($PK) - UniqueHashIndex
+ALTER ONLINE TABLE t1 ADD PRIMARY KEY (a);
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD PRIMARY KEY (a)'
+ALTER OFFLINE TABLE t1 ADD PRIMARY KEY (a);
+a Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+PRIMARY KEY(a) - UniqueHashIndex
+PRIMARY(a) - OrderedIndex
+ALTER ONLINE TABLE t1 DROP PRIMARY KEY;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 DROP PRIMARY KEY'
+ALTER OFFLINE TABLE t1 DROP PRIMARY KEY;
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
+PRIMARY KEY($PK) - UniqueHashIndex
+CREATE ONLINE UNIQUE INDEX pk ON t1(a);
+ERROR 42000: This version of MySQL doesn't yet support 'CREATE ONLINE UNIQUE INDEX pk ON t1(a)'
+CREATE OFFLINE UNIQUE INDEX pk ON t1(a);
+a Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+PRIMARY KEY(a) - UniqueHashIndex
+ALTER ONLINE TABLE t1 DROP INDEX PK;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 DROP INDEX PK'
+ALTER OFFLINE TABLE t1 DROP INDEX PK;
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
+PRIMARY KEY($PK) - UniqueHashIndex
+DROP TABLE t1;
+CREATE TABLE t1 (a INT UNSIGNED) ENGINE NDB;
+ALTER ONLINE TABLE t1 ADD b INT UNIQUE;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD b INT UNIQUE'
+ALTER OFFLINE TABLE t1 ADD b INT UNIQUE;
+$PK Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY AUTO_INCR
+PRIMARY KEY($PK) - UniqueHashIndex
+ALTER ONLINE TABLE t1 ADD c INT NOT NULL UNIQUE;
+ERROR 42000: This version of MySQL doesn't yet support 'ALTER ONLINE TABLE t1 ADD c INT NOT NULL UNIQUE'
+ALTER OFFLINE TABLE t1 ADD c INT NOT NULL UNIQUE;
+c Int PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+PRIMARY KEY(c) - UniqueHashIndex
+DROP TABLE t1;
+****************************************
 * Add column c as nullable TEXT and BLOB
 ****************************************
 CREATE TABLE t1 (a INT UNSIGNED  AUTO_INCREMENT KEY, b INT DEFAULT 2 COLUMN_FORMAT DYNAMIC) ENGINE NDB;