Commit 56d00512 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into moonbone.local:/work/16272-bug-5.0-mysql
parents c033d138 315a4613

mysql-test/r/func_if.result

+7 −0
Original line number Diff line number Diff line
@@ -121,3 +121,10 @@ a NULLIF(a,'') 
NULL	NULL

	NULL

DROP TABLE t1;

create table t1 (f1 int, f2 int);

insert into t1 values(1,1),(0,0);

select f1, f2, if(f1, 40.0, 5.00) from t1 group by f1 order by f2;

f1	f2	if(f1, 40.0, 5.00)

0	0	5.00

1	1	40.00

drop table t1;

mysql-test/t/func_if.test

+8 −0
Original line number Diff line number Diff line
@@ -89,3 +89,11 @@ SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL; 
DROP TABLE t1;



# End of 4.1 tests



#

# Bug #16272 IF function with decimal args can produce wrong result

#

create table t1 (f1 int, f2 int);

insert into t1 values(1,1),(0,0);

select f1, f2, if(f1, 40.0, 5.00) from t1 group by f1 order by f2;

drop table t1;

sql/item_cmpfunc.cc

+2 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,8 @@ Item_func_if::fix_length_and_dec() 
  max_length=

    (cached_result_type == DECIMAL_RESULT || cached_result_type == INT_RESULT) ?

    (max(args[1]->max_length - args[1]->decimals,

         args[2]->max_length - args[2]->decimals) + decimals) :

         args[2]->max_length - args[2]->decimals) + decimals +

         (unsigned_flag ? 0 : 1) ) :

    max(args[1]->max_length, args[2]->max_length);

}