diff options
| author | unknown <monty@mysql.com> | 2003-11-20 22:30:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-20 22:30:48 +0200 |
| commit | 411b610e7169405ba1fbd8d3c8d4d30fb204dd14 (patch) | |
| tree | 47f72b790e762b88773ac94032106a9fec3ee4a4 /mysql-test/r/user_var.result | |
| parent | 671cc0a57491e8084b06a7aa6153f0d05c8ae6ef (diff) | |
| parent | cd878c2c8a4a639b2a7147ecf00ce791e15faa42 (diff) | |
| download | mariadb-git-411b610e7169405ba1fbd8d3c8d4d30fb204dd14.tar.gz | |
Merge with 4.0 to get:
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
BitKeeper/etc/ignore:
auto-union
libmysql_r/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/r/rpl_loaddata.result:
Merge with 4.0
sql/item.cc:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/item.h:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/sql_handler.cc:
Merge with 4.0 to get fix for FLUSH TABLE with HANDLER
sql/sql_repl.cc:
Merge with 4.0
sql/sql_select.cc:
Used original file.
(Comments moved to sql/sql_select.h)
Diffstat (limited to 'mysql-test/r/user_var.result')
| -rw-r--r-- | mysql-test/r/user_var.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 612c1f53bcf..fc3dc4eddcd 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -101,3 +101,22 @@ drop table t1; select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b 10 2 1 10 2 1 10 2 1 10 2 1 +create table t1 (i int not null); +insert t1 values (1),(2),(2),(3),(3),(3); +select @a:=0; +@a:=0 +0 +select @a, @a:=@a+count(*), count(*), @a from t1 group by i; +@a @a:=@a+count(*) count(*) @a +0 1 1 0 +0 2 2 0 +0 3 3 0 +select @a:=0; +@a:=0 +0 +select @a+0, @a:=@a+0+count(*), count(*), @a+0 from t1 group by i; +@a+0 @a:=@a+0+count(*) count(*) @a+0 +0 1 1 0 +1 3 2 0 +3 6 3 0 +drop table t1; |