[Commits] Rev 3684: Merge from 5.3 in file:///home/bell/maria/bzr/work-maria-10.0-base-merge-5.5/

sanja at montyprogram.com sanja at montyprogram.com
Mon Aug 19 15:23:30 EEST 2013


At file:///home/bell/maria/bzr/work-maria-10.0-base-merge-5.5/

------------------------------------------------------------
revno: 3684 [merge]
revision-id: bar at mariadb.org-20130808074849-ynolzx577luuhab2
parent: sanja at montyprogram.com-20130805143438-4o9qmx7bq56rsgcp
parent: bar at mariadb.org-20130808073603-kgc2r86e2mnkjlej
author: Alexander Barkov <bar at mariadb.org>
committer: sanja at montyprogram.com
branch nick: 5.5
timestamp: Thu 2013-08-08 11:48:49 +0400
message:
  Merge from 5.3
  
  pending merges:
    Alexander Barkov 2013-08-08 MDEV-4512 Valgrind warnings in my_long10_to_...
modified:
  mysql-test/r/func_set.result   sp1f-func_set.result-20001228015633-j3yzglmi5wadjwgi7ploqj42uqopnhha
  mysql-test/t/func_set.test     sp1f-func_set.test-20001228015636-dyslyfpvjhbni77gcwkikxezsjxv6l3n
  sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
-------------- next part --------------
=== modified file 'mysql-test/r/func_set.result'
--- a/mysql-test/r/func_set.result	2011-03-04 14:46:17 +0000
+++ b/mysql-test/r/func_set.result	2013-08-08 07:48:49 +0000
@@ -160,6 +160,25 @@ CONVERT( a USING latin1 )
 
 DROP TABLE t1, t2;
 #
+# Start of 5.3 tests
+#
+#
+# MDEV-4512 Valgrind warnings in my_long10_to_str_8bit on INTERVAL and DATE_ADD with incorrect types
+#
+CREATE TABLE t1 (pk INT PRIMARY KEY);
+INSERT INTO t1 VALUES (10),(11);
+SELECT INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 ) FROM t1;
+INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 )
+8
+8
+Warnings:
+Warning	1292	Incorrect datetime value: '10'
+Warning	1292	Incorrect datetime value: '11'
+DROP TABLE t1;
+#
+# End of 5.3 tests
+#
+#
 # BUG#59405: FIND_IN_SET won't work normaly after upgrade from 5.1 to 5.5
 #
 CREATE TABLE t1(days set('1','2','3','4','5','6','7'));

=== modified file 'mysql-test/t/func_set.test'
--- a/mysql-test/t/func_set.test	2011-03-04 14:46:17 +0000
+++ b/mysql-test/t/func_set.test	2013-08-08 07:48:49 +0000
@@ -99,6 +99,23 @@ SELECT CONVERT( a USING latin1 ) FROM t2
 DROP TABLE t1, t2;
 
 --echo #
+--echo # Start of 5.3 tests
+--echo #
+
+--echo #
+--echo # MDEV-4512 Valgrind warnings in my_long10_to_str_8bit on INTERVAL and DATE_ADD with incorrect types
+--echo #
+CREATE TABLE t1 (pk INT PRIMARY KEY);
+INSERT INTO t1 VALUES (10),(11);
+SELECT INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 ) FROM t1;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 5.3 tests
+--echo #
+
+
+--echo #
 --echo # BUG#59405: FIND_IN_SET won't work normaly after upgrade from 5.1 to 5.5
 --echo #
 

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2013-07-31 13:24:52 +0000
+++ b/sql/item_cmpfunc.cc	2013-08-08 07:48:49 +0000
@@ -2006,7 +2006,7 @@ void Item_func_interval::fix_length_and_
     for (uint i= 1; not_null_consts && i < rows; i++)
     {
       Item *el= row->element_index(i);
-      not_null_consts&= el->const_item() & !el->is_null();
+      not_null_consts&= el->const_item() && !el->is_null();
     }
 
     if (not_null_consts &&



More information about the commits mailing list