From: Sergey Glukhov
Date: April 28 2011 8:12am
Subject: bzr commit into mysql-5.1 branch (sergey.glukhov:3674) Bug#12403504
List-Archive: http://lists.mysql.com/commits/136270
X-Bug: 12403504
Message-Id: <201104280812.p3S8CQad029397@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5716886549337305492=="

--===============5716886549337305492==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/gluh/MySQL/mysql-5.1/ based on revid:sergey.glukhov@stripped

 3674 Sergey Glukhov	2011-04-28
      Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0
      There is a missing check for 'year' parameter(year can not be greater than 9999) in
      makedate function. The fix is to addd check that year can not be greater than 9999.
     @ mysql-test/r/func_time.result
        test case
     @ mysql-test/t/func_time.test
        test case
     @ sql/item_timefunc.cc
        added check that year can not be greater than 9999.

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item_timefunc.cc
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2011-04-27 07:35:57 +0000
+++ b/mysql-test/r/func_time.result	2011-04-28 08:12:18 +0000
@@ -1417,4 +1417,10 @@ NULL
 SELECT DATE_FORMAT('0000-00-11', '%w');
 DATE_FORMAT('0000-00-11', '%w')
 NULL
+#
+# Bug#12403504  AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0
+#
+SELECT MAKEDATE(11111111,1);
+MAKEDATE(11111111,1)
+NULL
 End of 5.1 tests

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-04-27 07:35:57 +0000
+++ b/mysql-test/t/func_time.test	2011-04-28 08:12:18 +0000
@@ -921,4 +921,10 @@ SELECT DATE_FORMAT('0000-00-11', '%W');
 SELECT DATE_FORMAT('0000-00-11', '%a');
 SELECT DATE_FORMAT('0000-00-11', '%w');
 
+--echo #
+--echo # Bug#12403504  AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0
+--echo #
+
+SELECT MAKEDATE(11111111,1);
+
 --echo End of 5.1 tests

=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc	2011-04-27 07:35:57 +0000
+++ b/sql/item_timefunc.cc	2011-04-28 08:12:18 +0000
@@ -2684,7 +2684,7 @@ String *Item_func_makedate::val_str(Stri
   long days;
 
   if (args[0]->null_value || args[1]->null_value ||
-      year < 0 || daynr <= 0)
+      year < 0 || year >= 10000L || daynr <= 0)
     goto err;
 
   if (year < 100)
@@ -2727,7 +2727,7 @@ longlong Item_func_makedate::val_int()
   long days;
 
   if (args[0]->null_value || args[1]->null_value ||
-      year < 0 || daynr <= 0)
+      year < 0 || year >= 10000L || daynr <= 0)
     goto err;
 
   if (year < 100)


--===============5716886549337305492==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/sergey.glukhov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@stripped\
#   p71p27xg6tx311lc
# target_branch: file:///home/gluh/MySQL/mysql-5.1/
# testament_sha1: 8320768e42f1b1ea3c508f19bff927af6fe7df24
# timestamp: 2011-04-28 12:12:26 +0400
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-5.1/
# base_revision_id: sergey.glukhov@stripped\
#   b7028gag212n8e0y
# 
# Begin bundle
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


--===============5716886549337305492==--