bk commit into 5.0 tree (istruewing:1.2483) BUG#24985

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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, 2007-03-27 12:39:31+02:00, istruewing@stripped +1 -0
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  After merge fix

  mysql-test/t/heap_btree.test@stripped, 2007-03-27 12:39:27+02:00, istruewing@stripped
+17 -18
    Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
                causes incorrect duplicate entries
    After merge fix

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug24985

--- 1.21/mysql-test/t/heap_btree.test	2007-03-27 12:39:43 +02:00
+++ 1.22/mysql-test/t/heap_btree.test	2007-03-27 12:39:43 +02:00
@@ -182,6 +182,23 @@ delete from t1 where a >= 2;
 select a from t1 order by a;
 drop table t1;
 
+#
+# Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
+#             causes incorrect duplicate entries
+#
+CREATE TABLE t1 (
+  c1 ENUM('1', '2'),
+  UNIQUE USING BTREE(c1)
+) ENGINE= MEMORY DEFAULT CHARSET= utf8;
+INSERT INTO t1 VALUES('1'), ('2');
+DROP TABLE t1;
+CREATE TABLE t1 (
+  c1 SET('1', '2'),
+  UNIQUE USING BTREE(c1)
+) ENGINE= MEMORY DEFAULT CHARSET= utf8;
+INSERT INTO t1 VALUES('1'), ('2');
+DROP TABLE t1;
+
 --echo End of 4.1 tests
 
 #
@@ -204,22 +221,4 @@ CREATE TABLE t1 (a INT, UNIQUE USING BTR
 INSERT INTO t1 VALUES(NULL),(NULL);
 DROP TABLE t1;
 
-#
-# Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
-#             causes incorrect duplicate entries
-#
-CREATE TABLE t1 (
-  c1 ENUM('1', '2'),
-  UNIQUE USING BTREE(c1)
-) ENGINE= MEMORY DEFAULT CHARSET= utf8;
-INSERT INTO t1 VALUES('1'), ('2');
-DROP TABLE t1;
-CREATE TABLE t1 (
-  c1 SET('1', '2'),
-  UNIQUE USING BTREE(c1)
-) ENGINE= MEMORY DEFAULT CHARSET= utf8;
-INSERT INTO t1 VALUES('1'), ('2');
-DROP TABLE t1;
-
---echo End of 4.1 tests
 --echo End of 5.0 tests