From: Sergey Glukhov
Date: March 22 2011 11:02am
Subject: bzr commit into mysql-5.1 branch (sergey.glukhov:3618) Bug#11765216
List-Archive: http://lists.mysql.com/commits/133492
X-Bug: 11765216
Message-Id: <201103221049.p2MAnQWc008440@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6713420386976257347=="

--===============6713420386976257347==
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:luis.soares@stripped

 3618 Sergey Glukhov	2011-03-22
      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-02-02 18:13:11 +0000
+++ b/mysql-test/r/func_time.result	2011-03-22 11:02:27 +0000
@@ -1375,4 +1375,10 @@ Warning	1292	Truncated incorrect time va
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: ''
 DROP TABLE t1;
+#
+# 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-02-02 18:13:11 +0000
+++ b/mysql-test/t/func_time.test	2011-03-22 11:02:27 +0000
@@ -881,4 +881,12 @@ INSERT INTO t1 VALUES (''),('');
 SELECT COUNT(*) FROM t1 GROUP BY TIME_TO_SEC(a);
 DROP TABLE t1;
 
+--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	2010-11-12 10:12:15 +0000
+++ b/sql/item_timefunc.cc	2011-03-22 11:02:27 +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;


--===============6713420386976257347==
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\
#   pnxl2257a4g8uh3b
# target_branch: file:///home/gluh/MySQL/mysql-5.1/
# testament_sha1: d9a9e502202f68fc44946888b839443245a9e352
# timestamp: 2011-03-22 14:02:33 +0300
# base_revision_id: luis.soares@stripped\
#   mrti4d2p09aj75z5
# 
# Begin bundle
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
owf+LuSKcKEhoryX2A==


--===============6713420386976257347==--