Bug#11766126 59166: ANOTHER DATETIME VALGRIND UNINITIALIZED WARNING

Sergey Glukhov · Sergey Glukhov · commit aa508d4df430 · 2011-03-30T11:00:41.000+04:00
Valgrind warning happens because null values check happens too late
in Item_func_month::val_str(after result string calculation).The fix
is to check null value before result string calculation.

--BZR--
revision-id: sergey.glukhov@oracle.com-20110330070041-8sniyg6fdtrfxlq7
property-branch-nick: mysql-5.1
property-file-info: ld7:file_id69:sp1f-func_time.result-20001228015633-voo54ouzgwctcbmk22zwazoev5os5o4x7:message10:test case
property-file-info: 4:path29:mysql-test/r/func_time.resulted7:file_id67:sp1f-func_time.test-20001228015636-a35kjdfabkx5uhymtqrz4c366obz4i7h7:message10:test case
property-file-info: 4:path27:mysql-test/t/func_time.tested7:file_id68:sp1f-item_timefunc.h-19700101030959-o34ypz6ggolzqmhgsjnqh6inkvgugi467:message50:check null value before result string calculation.4:path19:sql/item_timefunc.hee
testament3-sha1: afaa9ad345fdd56c5ecbcea857bde790dcacad5d
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
@@ -1393,4 +1393,10 @@ SET GLOBAL SQL_MODE=DEFAULT;
 SELECT FORMAT(YEAR(STR_TO_DATE('',GET_FORMAT(TIME,''))),1);
 FORMAT(YEAR(STR_TO_DATE('',GET_FORMAT(TIME,''))),1)
 NULL
+#
+# Bug#11766126  59166: ANOTHER DATETIME VALGRIND UNINITIALIZED WARNING
+#
+SELECT CAST((MONTH(FROM_UNIXTIME(@@GLOBAL.SQL_MODE))) AS BINARY(1025));
+CAST((MONTH(FROM_UNIXTIME(@@GLOBAL.SQL_MODE))) AS BINARY(1025))
+NULL
 End of 5.1 tests
diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
@@ -901,4 +901,10 @@ SET GLOBAL SQL_MODE=DEFAULT;
 
 SELECT FORMAT(YEAR(STR_TO_DATE('',GET_FORMAT(TIME,''))),1);
 
+--echo #
+--echo # Bug#11766126  59166: ANOTHER DATETIME VALGRIND UNINITIALIZED WARNING
+--echo #
+
+SELECT CAST((MONTH(FROM_UNIXTIME(@@GLOBAL.SQL_MODE))) AS BINARY(1025));
+
 --echo End of 5.1 tests
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
@@ -106,8 +106,11 @@ class Item_func_month :public Item_func
   { DBUG_ASSERT(fixed == 1); return (double) Item_func_month::val_int(); }
   String *val_str(String *str) 
   {
-    str->set(val_int(), &my_charset_bin);
-    return null_value ? 0 : str;
+    longlong nr= val_int();
+    if (null_value)
+      return 0;
+    str->set(nr, &my_charset_bin);
+    return str;
   }
   const char *func_name() const { return "month"; }
   enum Item_result result_type () const { return INT_RESULT; }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,11 @@ class Item_func_month :public Item_func`
`106`	`106`	`{ DBUG_ASSERT(fixed == 1); return (double) Item_func_month::val_int(); }`
`107`	`107`	`String val_str(String str)`
`108`	`108`	`{`
`109`		`- str->set(val_int(), &my_charset_bin);`
`110`		`- return null_value ? 0 : str;`
	`109`	`+ longlong nr= val_int();`
	`110`	`+ if (null_value)`
	`111`	`+ return 0;`
	`112`	`+ str->set(nr, &my_charset_bin);`
	`113`	`+ return str;`
`111`	`114`	`}`
`112`	`115`	`const char *func_name() const { return "month"; }`
`113`	`116`	`enum Item_result result_type () const { return INT_RESULT; }`