diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-17 22:44:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 22:44:51 +0300 |
| commit | 05821367d403ff69e6af3c83ceb45756376f9b94 (patch) | |
| tree | 84e69c2b39154e624f807c4628e21f3d0fdb1da3 /mysql-test | |
| parent | 28097f40d3d13a1d42ef7a98b2ebc3330fd41a83 (diff) | |
| download | mariadb-git-05821367d403ff69e6af3c83ceb45756376f9b94.tar.gz | |
Fixed bug in UNION when doing UNION with the same tables
myisam/mi_extra.c:
More debugging information
mysql-test/r/union.result:
Added test for UNION bug
mysql-test/t/union.test:
Added test for UNION bug
sql/sql_base.cc:
Clear field->query_id when using UNION
sql/sql_parse.cc:
Fix for UNION bug
sql/sql_union.cc:
Cleanup
sql/table.h:
Fix for UNION bug
tools/Makefile.am:
Fix for compiling with MIT-threads
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/union.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index a0836cf1680..0598bfb9ca0 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -62,7 +62,11 @@ t2 ALL NULL NULL NULL NULL 4 pseudo dekad joce +pseudo1 +joce +testtt +tsestset pseudo pseudo1 same -dekad joce 1 -joce testtt 1 joce tsestset 1 +joce testtt 1 +dekad joce 1 diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 8325e6c7e77..e780e9ec528 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -60,5 +60,6 @@ CREATE TABLE t1 ( ) TYPE=MyISAM; INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1); SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce'; -SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce'; +SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce'; +SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc; drop table t1; |