Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE

            causes incorrect duplicate entries
After merge fix

1 files changed, 17 insertions, 18 deletions

diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test
index 14b1779bd1a..d2891943a4e 100644
--- a/mysql-test/t/heap_btree.test
+++ b/mysql-test/t/heap_btree.test
@@ -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 BTREE(a)) ENGINE=MEMORY;
 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