summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-10-14 17:50:44 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-10-14 17:50:44 +0300
commit9e6b04a285ea54a204f29849c67c24a22e6e271b (patch)
treeef4c5126fc918df8c09135dfc162ee5174d57341 /mysql-test
parent393e96afdc852620eb2af7c63ebebb76472c1813 (diff)
parent70a1cebb88db209d0f44365da6622c3dd3bfcf39 (diff)
downloadmariadb-git-9e6b04a285ea54a204f29849c67c24a22e6e271b.tar.gz
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_lex.h: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/select.result10
-rw-r--r--mysql-test/t/select.test4
2 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index fc918012d1f..c4fac8d8e7f 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3266,3 +3266,13 @@ select wss_type from t1 where wss_type =102935229216544093;
wss_type
102935229216544093
drop table t1;
+select 1+2,"aaaa",3.13*2.0 into @a,@b,@c;
+select @a;
+@a
+3
+select @b;
+@b
+aaaa
+select @c;
+@c
+6.26
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 94806d44e37..57a17e40723 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -1751,3 +1751,7 @@ select wss_type from t1 where wss_type ='102935229216544104';
select wss_type from t1 where wss_type ='102935229216544093';
select wss_type from t1 where wss_type =102935229216544093;
drop table t1;
+select 1+2,"aaaa",3.13*2.0 into @a,@b,@c;
+select @a;
+select @b;
+select @c;