summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-17 15:40:03 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-17 15:40:03 +0300
commit3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce (patch)
tree223c241e869976a0e08b0b04c79b6e43d262ab79 /mysql-test/r/union.result
parentb69a91cc3c7e77664e0476d52860bc1b0fcb87d9 (diff)
downloadmariadb-git-3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce.tar.gz
Fixed bug with SELECT * ... UNION
client/mysql.cc: Increased version number client/mysqltest.c: Changed to use default path include/mysql.h: Changed prototype of mysql_server_init libmysql/libmysql.c: Changed prototype of mysql_server_init libmysqld/lib_sql.cc: Changed prototype of mysql_server_init mysql-test/r/union.result: Added test for UNION bug mysql-test/t/union.test: Added test for UNION bug
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index b46a706264f..a0836cf1680 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -62,3 +62,7 @@ t2 ALL NULL NULL NULL NULL 4
pseudo
dekad
joce
+pseudo pseudo1 same
+dekad joce 1
+joce testtt 1
+joce tsestset 1