From: Sergey Glukhov
Date: May 4 2011 8:13am
Subject: bzr commit into mysql-5.1 branch (sergey.glukhov:3674) Bug#12403504
List-Archive: http://lists.mysql.com/commits/136617
X-Bug: 12403504
Message-Id: <201105040816.p448G0Kt001562@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2120938858974067459=="

--===============2120938858974067459==
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-05-04
      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-05-04 08:13:21 +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-05-04 08:13:21 +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-05-04 08:13:21 +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 > 9999 || 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 > 9999 || daynr <= 0)
     goto err;
 
   if (year < 100)


--===============2120938858974067459==
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\
#   r7nr464pds0ngusz
# target_branch: file:///home/gluh/MySQL/mysql-5.1/
# testament_sha1: cc319b67e927481af8a754ffcb4ea5de4e543db4
# timestamp: 2011-05-04 12:13:25 +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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


--===============2120938858974067459==--