summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-21 03:38:35 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-21 03:38:35 +0300
commitc1a80bc0615f15535bb297e0f065091b2945af21 (patch)
treebd27d62de7286eca9070d981c59b7cc1c889d9f1 /mysql-test/t/union.test
parent5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff)
downloadmariadb-git-c1a80bc0615f15535bb297e0f065091b2945af21.tar.gz
Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION client/mysqlbinlog.cc: Added error message handling to read_log_event() heap/hp_write.c: More debug info myisam/myisampack.c: Cleanup mysql-test/mysql-test-run.sh: Portability fixes. mysql-test/r/union.result: More tests cases for UNION mysql-test/t/union.test: More tests cases for UNION sql/Makefile.am: Added mysql_embed.h sql/item.cc: Fixed bug when using the same table multiple times in union. sql/log_event.cc: Removed use of ## construct (Portability problem) sql/log_event.h: Added error message handling to read_log_event() sql/mysql_priv.h: Added mysql_embed.h sql/opt_sum.cc: Cleanup sql/slave.cc: cleanup sql/sql_base.cc: Integrated table->ref_primary_key into table->part_of_key sql/sql_union.cc: Cleanup sql/table.cc: Integrated table->ref_primary_key into table->part_of_key sql/table.h: Integrated table->ref_primary_key into table->part_of_key
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r--mysql-test/t/union.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index a4a29c76e65..4c67ec10bb3 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -62,4 +62,7 @@ INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tses
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 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;
drop table t1;