Commit b419501e authored by unknown's avatar unknown
Browse files

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

into  polly.local:/tmp/20924/bug20294/my50-bug20294


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/case.result:
  Manual merge
mysql-test/r/func_if.result:
  Manual merge
mysql-test/r/func_test.result:
  Manual merge
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/case.test:
  Manual merge
mysql-test/t/func_if.test:
  Manual merge
mysql-test/t/func_test.test:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
sql/item_func.cc:
  Manual merge
parents d31a3434 418ae41b

mysql-test/r/case.result

+0 −7
Original line number Diff line number Diff line
@@ -200,10 +200,3 @@ CEMPNUM EMPMUM1 EMPNUM2 
0.00	0	0.00

2.00	2	NULL

DROP TABLE t1,t2;
 
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
@@ -128,10 +128,3 @@ f1 f2 if(f1, 40.0, 5.00) 
0	0	5.00

1	1	40.00

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
@@ -204,10 +204,3 @@ NULL 
SELECT GREATEST(1.5E+2,1.3E+2,NULL) FROM DUAL;

GREATEST(1.5E+2,1.3E+2,NULL)

NULL
 
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
@@ -256,8 +256,3 @@ t1 CREATE TABLE `t1` ( 
  `@first_var` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;
 
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
@@ -152,12 +152,4 @@ SELECT IFNULL(t2.EMPNUM,t1.EMPNUM) AS CEMPNUM, 
  FROM t1 LEFT JOIN t2 ON t1.EMPNUM=t2.EMPNUM;



DROP TABLE t1,t2;

#

# 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