diff options
| author | unknown <kaa@polly.local> | 2006-09-12 19:35:44 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-12 19:35:44 +0400 |
| commit | 76f18d7ff0b76fd19495fae3b34c98ce33371a1c (patch) | |
| tree | 87937eb913a46a5ab21071c8d4e2bd3cdf9bbe7f /mysql-test/t/user_var.test | |
| parent | b597aaf906b4bdda7fb7ccf34943fff4a077df58 (diff) | |
| parent | d31a3434650a9991bcc16478e65efd7d2ea23c76 (diff) | |
| download | mariadb-git-76f18d7ff0b76fd19495fae3b34c98ce33371a1c.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index b2a9728de00..192a92fc660 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -144,8 +144,6 @@ select @@version; --replace_column 1 # select @@global.version; -# End of 4.1 tests - # # Bug #6598: problem with cast(NULL as signed integer); # @@ -212,3 +210,5 @@ insert into t1 values (1,2),(2,3),(3,1); 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 |