diff options
author | unknown <istruewing@chilla.local> | 2007-03-28 08:51:12 +0200 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2007-03-28 08:51:12 +0200 |
commit | fd3b72356284822bc15e7d0db923cc11cca82abf (patch) | |
tree | 0ae4b27dfa1d749903e0257520f9deea66e6e5b5 /mysql-test | |
parent | f9cf31c4dfd15fb50ea7bf1e3a86058689cbb509 (diff) | |
parent | 1fd0ba8909465f70c3b4e5d4dea4dc56b132896a (diff) | |
download | mariadb-git-fd3b72356284822bc15e7d0db923cc11cca82abf.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into chilla.local:/home/mydev/mysql-4.1-bug24985
mysql-test/r/heap_btree.result:
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries
Manual merge
mysql-test/t/heap_btree.test:
Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries
Manual merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/heap_btree.result | 12 | ||||
-rw-r--r-- | mysql-test/t/heap_btree.test | 17 |
2 files changed, 29 insertions, 0 deletions
diff --git a/mysql-test/r/heap_btree.result b/mysql-test/r/heap_btree.result index 1a0666514be..72be6a3e400 100644 --- a/mysql-test/r/heap_btree.result +++ b/mysql-test/r/heap_btree.result @@ -295,4 +295,16 @@ A 1 B 0 C 0 DROP TABLE t1; +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; End of 4.1 tests diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index 63baa968981..f8d6afbad04 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -196,4 +196,21 @@ UPDATE t1 SET c2= c2 + 1 WHERE c1 = 'A'; SELECT * FROM t1; 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 |