diff options
| author | svoj@mysql.com/june.mysql.com <> | 2007-04-18 16:22:23 +0500 |
|---|---|---|
| committer | svoj@mysql.com/june.mysql.com <> | 2007-04-18 16:22:23 +0500 |
| commit | 2d64de7d7e03c42faaac7802ee4fcf9c12f6f1c2 (patch) | |
| tree | daafee84641b790ed6fcfe3aee1e1ea1fbf2b453 /mysql-test | |
| parent | c7ac1e1c6a51ed68f4abc556824db679aa4031ac (diff) | |
| parent | aa432f0ffb157b025edb8dde2b0e8c5c17cb3da8 (diff) | |
| download | mariadb-git-2d64de7d7e03c42faaac7802ee4fcf9c12f6f1c2.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.0-engines
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 11 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index c4419d64a65..27465dd96f6 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -816,6 +816,17 @@ ALTER TABLE m1 ENGINE=MERGE UNION=(t1); SELECT * FROM m1; c1 c2 c3 c4 c5 c6 c7 c8 c9 DROP TABLE t1, m1; +CREATE TABLE t1 (a VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_german2_ci, +b INT, INDEX(a,b)); +CREATE TABLE t2 LIKE t1; +CREATE TABLE t3 LIKE t1; +ALTER TABLE t3 ENGINE=MERGE UNION=(t1,t2); +INSERT INTO t1 VALUES ('ss',1); +INSERT INTO t2 VALUES ('ss',2),(0xDF,2); +SELECT COUNT(*) FROM t3 WHERE a=0xDF AND b=2; +COUNT(*) +2 +DROP TABLE t1,t2,t3; create table t1 (b bit(1)); create table t2 (b bit(1)); create table tm (b bit(1)) engine = merge union = (t1,t2); diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 490010c0a42..b3944416adc 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -447,6 +447,19 @@ ALTER TABLE m1 ENGINE=MERGE UNION=(t1); SELECT * FROM m1; DROP TABLE t1, m1; +# +# BUG#24342 - Incorrect results with query over MERGE table +# +CREATE TABLE t1 (a VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_german2_ci, + b INT, INDEX(a,b)); +CREATE TABLE t2 LIKE t1; +CREATE TABLE t3 LIKE t1; +ALTER TABLE t3 ENGINE=MERGE UNION=(t1,t2); +INSERT INTO t1 VALUES ('ss',1); +INSERT INTO t2 VALUES ('ss',2),(0xDF,2); +SELECT COUNT(*) FROM t3 WHERE a=0xDF AND b=2; +DROP TABLE t1,t2,t3; + # End of 4.1 tests # |