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

4 files changed, 4 insertions, 42 deletions

diff --git a/mysql-test/t/case.test b/mysql-test/t/case.test
index d0d503a8821..fd1b6e5247f 100644
--- a/mysql-test/t/case.test
+++ b/mysql-test/t/case.test
@@ -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
diff --git a/mysql-test/t/func_if.test b/mysql-test/t/func_if.test
index 69cfcf7860b..5756793c673 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/t/func_if.test
@@ -73,18 +73,4 @@ SELECT a, NULLIF(a,'') FROM t1 WHERE NULLIF(a,'') IS NULL;
 
 DROP TABLE t1;
 
-#
-# Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various
-# functions
-# - UNSIGNED values in IF() are treated as SIGNED
-#
-SELECT IF(1 != 0, 18446744073709551615, 1);
-
-#
-# Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various
-# functions
-# - UNSIGNED values in IFNULL() are treated as SIGNED
-#
-SELECT IFNULL(NULL, 18446744073709551615);
-
---echo End of 4.1 tests
+# End of 4.1 tests
diff --git a/mysql-test/t/func_test.test b/mysql-test/t/func_test.test
index 549b0e60246..2ad64b6c5a6 100644
--- a/mysql-test/t/func_test.test
+++ b/mysql-test/t/func_test.test
@@ -108,12 +108,4 @@ 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;
 
-#
-# Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various
-# functions
-# - UNSIGNED values in GREATEST() and LEAST() are treated as SIGNED
-#
-SELECT GREATEST(1, 18446744073709551615);
-SELECT LEAST(1, 18446744073709551615);
-
---echo End of 4.1 tests
+# End of 4.1 tests
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index b7c8f962637..7691a574a2a 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -141,12 +141,4 @@ select @@global.version;
 --replace_column 1 #
 select @@session.VERSION;
 
-#
-# Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various
-# functions
-# - SET on a user variable saves UNSIGNED as SIGNED
-#
-set @a=18446744073709551615;
-select @a;
-
---echo End of 4.1 tests
+# End of 4.1 tests