From: Sergey Glukhov
Date: March 28 2011 1:24pm
Subject: bzr commit into mysql-5.1 branch (sergey.glukhov:3638) Bug#11765216
List-Archive: http://lists.mysql.com/commits/134056
X-Bug: 11765216
Message-Id: <201103281326.p2SDQTqq008577@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1105620684699788933=="

--===============1105620684699788933==
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:georgi.kodinov@stripped

 3638 Sergey Glukhov	2011-03-28
      Bug#11765216  58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTION
      Valgrind warning happens due to uninitialized cached_format_type field
      which is used later in Item_func_str_to_date::val_str method.
      The fix is to init cached_format_type field.
     @ mysql-test/r/func_time.result
        test case
     @ mysql-test/t/func_time.test
        test case
     @ sql/item_timefunc.cc
        init cached_format_type field

    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-03-28 07:53:18 +0000
+++ b/mysql-test/r/func_time.result	2011-03-28 13:24:25 +0000
@@ -1381,4 +1381,10 @@ DROP TABLE t1;
 SELECT STR_TO_DATE(SPACE(2),'1');
 STR_TO_DATE(SPACE(2),'1')
 0000-00-00
+#
+# Bug#11765216  58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTION
+#
+SET GLOBAL SQL_MODE='';
+DO  STR_TO_DATE((''), FROM_DAYS(@@GLOBAL.SQL_MODE));
+SET GLOBAL SQL_MODE=DEFAULT;
 End of 5.1 tests

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-03-28 07:53:18 +0000
+++ b/mysql-test/t/func_time.test	2011-03-28 13:24:25 +0000
@@ -887,4 +887,12 @@ DROP TABLE t1;
 
 SELECT STR_TO_DATE(SPACE(2),'1');
 
+--echo #
+--echo # Bug#11765216  58154: UNINITIALIZED VARIABLE FORMAT IN STR_TO_DATE FUNCTION
+--echo #
+
+SET GLOBAL SQL_MODE='';
+DO  STR_TO_DATE((''), FROM_DAYS(@@GLOBAL.SQL_MODE));
+SET GLOBAL SQL_MODE=DEFAULT;
+
 --echo End of 5.1 tests

=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc	2011-03-28 07:53:18 +0000
+++ b/sql/item_timefunc.cc	2011-03-28 13:24:25 +0000
@@ -3293,6 +3293,7 @@ void Item_func_str_to_date::fix_length_a
 {
   maybe_null= 1;
   decimals=0;
+  cached_format_type= DATE_TIME;
   cached_field_type= MYSQL_TYPE_DATETIME;
   max_length= MAX_DATETIME_FULL_WIDTH*MY_CHARSET_BIN_MB_MAXLEN;
   cached_timestamp_type= MYSQL_TIMESTAMP_NONE;


--===============1105620684699788933==
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\
#   7p6fs1054l45i54i
# target_branch: file:///home/gluh/MySQL/mysql-5.1/
# testament_sha1: 6d2a6093ab54d92fa79465d2d80bf73352c9aefe
# timestamp: 2011-03-28 17:24:28 +0400
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-5.1/
# base_revision_id: georgi.kodinov@stripped\
#   xlf2v4gjx01tz060
# 
# Begin bundle
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
YP/i7kinChIaDfJtwA==


--===============1105620684699788933==--