diff options
author | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-01-02 21:34:12 +0200 |
commit | 62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744 (patch) | |
tree | 8dbf52f0dc71a962692f98d1363958acf5d8fd67 /mysql-test/r/variables.result | |
parent | f4fee3d90e8456cfd2a4e2f395bd270d0a12c70d (diff) | |
parent | 38e174cc59f99e8bd55e98d2d427037a5a7719e6 (diff) | |
download | mariadb-git-62c4fa399e0c7acb1e7dfdae4ceac4b61daeb744.tar.gz |
merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqldump.c:
Use local version in 4.0
configure.in:
Use 4.0 code
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r-- | mysql-test/r/variables.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index ca67bdeb857..52189c36831 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -24,3 +24,14 @@ select @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3; select @t5; @t5 1.23456 +@min_cid:=min(c_id) @max_cid:=max(c_id) +1 4 +c_id c_name c_country +1 Bozo USA +4 Mr. Floppy GB +c_id c_name c_country +1 Bozo USA +4 Mr. Floppy GB +c_id c_name c_country +1 Bozo USA +4 Mr. Floppy GB |