summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-22 17:40:57 +0300
committermonty@hundin.mysql.fi <>2001-09-22 17:40:57 +0300
commite390a995737f136c594a7c792caa12061690800f (patch)
tree23349a84d09c518565222da27e0607b42d415f18 /mysql-test
parentb0953cfa86881af7aa330adc687bbf1b1a488524 (diff)
downloadmariadb-git-e390a995737f136c594a7c792caa12061690800f.tar.gz
Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/union.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index 4c67ec10bb3..5c4a62d5c41 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -61,7 +61,7 @@ CREATE TABLE t1 (
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 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;
+SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc;
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce';
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce';
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1;