summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/union.result8
-rw-r--r--mysql-test/t/union.test3
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;