Commit 5d7cdfb3 authored by unknown's avatar unknown
Browse files

Merge polly.local:/tmp/20924/bug20294/my41-bug20294 

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_class.h:
  Auto merged
parents b479dcd1 418ae41b

mysql-test/r/case.result

+0 −7
Original line number Diff line number Diff line
@@ -177,10 +177,3 @@ from t1 where b=3 group by b; 
min(a)	min(case when 1=1 then a else NULL end)	min(case when 1!=1 then NULL else a end)

2	2	2

drop table t1;
 
SELECT CASE 1 WHEN 1 THEN 18446744073709551615 ELSE 1 END;

CASE 1 WHEN 1 THEN 18446744073709551615 ELSE 1 END

18446744073709551615

SELECT COALESCE(18446744073709551615);

COALESCE(18446744073709551615)

18446744073709551615

End of 4.1 tests

mysql-test/r/func_if.result

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

	NULL

DROP TABLE t1;
 
SELECT IF(1 != 0, 18446744073709551615, 1);

IF(1 != 0, 18446744073709551615, 1)

18446744073709551615

SELECT IFNULL(NULL, 18446744073709551615);

IFNULL(NULL, 18446744073709551615)

18446744073709551615

End of 4.1 tests

mysql-test/r/func_test.result

+0 −7
Original line number Diff line number Diff line
@@ -183,10 +183,3 @@ select 5.1 mod 3, 5.1 mod -3, -5.1 mod 3, -5.1 mod -3; 
select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;

5 mod 3	5 mod -3	-5 mod 3	-5 mod -3

2	2	-2	-2
 
SELECT GREATEST(1, 18446744073709551615);

GREATEST(1, 18446744073709551615)

18446744073709551615

SELECT LEAST(1, 18446744073709551615);

LEAST(1, 18446744073709551615)

1

End of 4.1 tests

mysql-test/r/user_var.result

+0 −5
Original line number Diff line number Diff line
@@ -203,8 +203,3 @@ select @@global.version; 
select @@session.VERSION;

@@session.VERSION

#
 
set @a=18446744073709551615;

select @a;

@a

18446744073709551615

End of 4.1 tests

mysql-test/t/case.test

+1 −9
Original line number Diff line number Diff line
@@ -130,12 +130,4 @@ select min(a), min(case when 1=1 then a else NULL end), 
from t1 where b=3 group by b;

drop table t1;



#

# Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various

# functions

# - UNSIGNED values in CASE and COALESCE are treated as SIGNED

#

SELECT CASE 1 WHEN 1 THEN 18446744073709551615 ELSE 1 END;

SELECT COALESCE(18446744073709551615);



--echo End of 4.1 tests
 
# End of 4.1 tests