diff options
| author | monty@hundin.mysql.fi <> | 2002-08-12 07:02:08 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-12 07:02:08 +0300 |
| commit | 454339b29cec79c0b6bb553c114c94a81fc1a0db (patch) | |
| tree | 9e11aafdd1181f916b001d220350797b71c91612 | |
| parent | 3ef9d44edcd3db115d03a6ed7e896c662ad2182e (diff) | |
| download | mariadb-git-454339b29cec79c0b6bb553c114c94a81fc1a0db.tar.gz | |
Fixes after last merge
| -rw-r--r-- | mysql-test/r/func_if.result | 6 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result index 16fb0358d51..0ab41258091 100644 --- a/mysql-test/r/func_if.result +++ b/mysql-test/r/func_if.result @@ -46,3 +46,9 @@ select sum(if(num is null,0.00,num)) from t1; sum(if(num is null,0.00,num)) 144.54 drop table t1; +create table t1 (x int, y int); +insert into t1 values (0,6),(10,16),(20,26),(30,10),(40,46),(50,56); +select min(if(y -x > 5,y,NULL)), max(if(y - x > 5,y,NULL)) from t1; +min(if(y -x > 5,y,NULL)) max(if(y - x > 5,y,NULL)) +6 56 +drop table t1; diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index bd03e9cffd3..97dc26df184 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -309,7 +309,7 @@ innobase_mysql_print_thd( buf[0]='\n'; buf[1]=0; - ut_a(strlen(old_buf) < 400); + ut_a(strlen(buf) < 400); } } |