bk commit into 5.0 tree (mskold:1.2288)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2006-12-07 15:51:16+01:00, mskold@stripped +2 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  MERGE: 1.1616.2759.6

  mysql-test/r/ndb_index_unique.result@stripped, 2006-12-07 15:51:11+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.3

  mysql-test/t/ndb_index_unique.test@stripped, 2006-12-07 15:51:11+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.4

# 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:	/windows/Linux_space/MySQL/mysql-5.0/RESYNC

--- 1.20/mysql-test/r/ndb_index_unique.result	2006-12-07 15:51:22 +01:00
+++ 1.21/mysql-test/r/ndb_index_unique.result	2006-12-07 15:51:22 +01:00
@@ -133,6 +133,21 @@ a	b	c
 6	7	2
 7	8	3
 8	2	3
+create unique index bi using hash on t2(b);
+insert into t2 values(9, 3, 1);
+ERROR 23000: Duplicate entry '' for key 0
+alter table t2 drop index bi;
+insert into t2 values(9, 3, 1);
+select * from t2 order by a;
+a	b	c
+2	3	5
+3	4	6
+4	5	8
+5	6	2
+6	7	2
+7	8	3
+8	2	3
+9	3	1
 drop table t2;
 CREATE TABLE t2 (
 a int unsigned NOT NULL PRIMARY KEY,

--- 1.18/mysql-test/t/ndb_index_unique.test	2006-12-07 15:51:22 +01:00
+++ 1.19/mysql-test/t/ndb_index_unique.test	2006-12-07 15:51:22 +01:00
@@ -83,6 +83,14 @@ delete from t2 where a = 1;
 insert into t2 values(8, 2, 3);
 select * from t2 order by a;
 
+# Bug #24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld
+create unique index bi using hash on t2(b);
+-- error 1062
+insert into t2 values(9, 3, 1);
+alter table t2 drop index bi;
+insert into t2 values(9, 3, 1);
+select * from t2 order by a;
+
 drop table t2;
 
 CREATE TABLE t2 (