diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-01 03:05:25 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-01 03:05:25 +0500 |
commit | 5d5c66fb66f2c587ce270b624c39662763fa7417 (patch) | |
tree | 3fddb8bc20db14c302c82c2ed2d8be8edb993484 /mysql-test/r/user_var.result | |
parent | 50b789c33d4c4ed875d8f56e8596d2b8e2ec89be (diff) | |
parent | 9fa12a386bedccfd258236556a9d398f58397625 (diff) | |
download | mariadb-git-5d5c66fb66f2c587ce270b624c39662763fa7417.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/t/view.test:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/user_var.result')
-rw-r--r-- | mysql-test/r/user_var.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 3a70dcddd24..25fe18dccaf 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -317,3 +317,10 @@ SHOW COUNT(*) WARNINGS; SHOW COUNT(*) ERRORS; @@session.error_count 1 +create table t1(f1 int); +insert into t1 values(1),(1),(2); +select @a:=f1, count(f1) from t1 group by 1; +@a:=f1 count(f1) +1 2 +2 1 +drop table t1; |