diff options
| author | unknown <kaa@polly.local> | 2006-09-13 16:06:59 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-13 16:06:59 +0400 |
| commit | a5a9b980545c64c998295e649346de3afd544f73 (patch) | |
| tree | 81fa1790787c1929f8f84c662007e725a71524c5 /mysql-test/t/user_var.test | |
| parent | 9f80b604a339db6f66e28b2c6a6f847231739624 (diff) | |
| parent | b419501e0df3201cb9d188ffd56fe84c468b3d17 (diff) | |
| download | mariadb-git-a5a9b980545c64c998295e649346de3afd544f73.tar.gz | |
Merge polly.local:/tmp/20924/bug20294/my50-bug20294
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_func.h:
Manual merge
Diffstat (limited to 'mysql-test/t/user_var.test')
| -rw-r--r-- | mysql-test/t/user_var.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index 192a92fc660..644ca506eba 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -144,7 +144,6 @@ select @@version; --replace_column 1 # select @@global.version; -# # Bug #6598: problem with cast(NULL as signed integer); # @@ -211,4 +210,4 @@ select @var:=f2 from t1 group by f1 order by f2 desc limit 1; select @var; drop table t1; ---echo End of 4.1 tests +# End of 4.1 tests |