Fixes after last merge

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;

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);
 }
 }