summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <bar@eagle.intranet.mysql.r18.ru>2005-03-28 14:23:03 +0500
committerunknown <bar@eagle.intranet.mysql.r18.ru>2005-03-28 14:23:03 +0500
commit1bb9a7944bd836f516eccb5df1202840081ba5f3 (patch)
tree61809ff93e7269066c48f63019b15f99279cb3d4 /mysql-test/r/union.result
parent1bf4aa09c2ce386f7b4999ab0ea21f633c0b4d37 (diff)
parente62a32a3a5e0459bb4bcdc6597e986c6c4eecf67 (diff)
downloadmariadb-git-1bb9a7944bd836f516eccb5df1202840081ba5f3.tar.gz
Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0 mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 663793e0b5e..b1dea29304e 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1195,3 +1195,8 @@ a b
2 b
3 c
drop table t1;
+set @val:=6;
+select concat('value is: ', @val) union select 'some text';
+concat('value is: ', @val)
+value is: 6
+some text