diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-20 21:10:04 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-20 21:10:04 +0200 |
| commit | 2b1b4abd98ff4760f8ad8987d2087ce7b4f08c8a (patch) | |
| tree | 27d8c1f5aaf484505337927724fff13f663d5a59 /mysql-test | |
| parent | f27d55586de005299417684252d33b238d741d2d (diff) | |
| parent | 9307bfe8055ae734c016e330634af4b3fb2fb63c (diff) | |
| download | mariadb-git-2b1b4abd98ff4760f8ad8987d2087ce7b4f08c8a.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 822fab5ae47..4b3046770dc 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -333,4 +333,5 @@ check table t1,t2; Table Op Msg_type Msg_text test.t1 check status OK test.t2 check status OK +select max(a) +1, max(a) +2 into @xx,@yy from t1; drop table t1,t2; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 4bde54f868a..7671b663738 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -241,5 +241,6 @@ select @@key_buffer_size; select * from t1 where a=2; select * from t2 where a=3; check table t1,t2; +select max(a) +1, max(a) +2 into @xx,@yy from t1; drop table t1,t2; |