Commit 152734e3 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed test results after last changes

parent be0a02c8

mysql-test/r/func_if.result

+1 −1
Original line number Diff line number Diff line
@@ -32,4 +32,4 @@ a 
aa

aaa

sum(if(num is null,0.00,num))

nan
 
144.54

mysql-test/r/func_test.result

+0 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
1

!0	NOT 0=1	!(0=0)	1 AND 1	1 && 0	0 OR 1	1 || NULL	1=1 or 1=1 and 1=0

1	1	0	1	0	1	1	1

IF(0,"ERROR","this")	IF(1,"is","ERROR")	IF(NULL,"ERROR","a")	IF(1,2,3)|0	IF(1,2.0,3.0)+0

this	is	a	2	2.0

2 between 1 and 3	"monty" between "max" and "my"	2=2 and "monty" between "max" and "my" and 3=3

1	1	1

'b' between 'a' and 'c'	'B' between 'a' and 'c'
@@ -34,5 +32,3 @@ this is a 2 2.0 
1	1

1 and 0 or 2	2 or 1 and 0

1	1
 
sum(if(num is null,0.00,num))

144.54

mysql-test/r/type_float.result

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ de2 decimal(6,0) YES NULL select,insert,update,references 
de3	decimal(5,2)	YES		NULL		select,insert,update,references

n	decimal(10,0)	YES		NULL		select,insert,update,references

n2	decimal(8,0)	YES		NULL		select,insert,update,references

n3	decimal(8,6)	YES		NULL		select,insert,update,references

n3	decimal(7,6)	YES		NULL		select,insert,update,references

a

-0.010

-0.002