From: Alexander Barkov
Date: January 17 2011 9:45am
Subject: bzr push into mysql-5.5 branch (alexander.barkov:3255 to 3256)
List-Archive: http://lists.mysql.com/commits/128915
Message-Id: <201101170945.p0H9jeoA001274@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3256 Alexander Barkov	2011-01-17 [merge]
      Merging from mysql-5.1

    modified:
      mysql-test/r/func_like.result
      mysql-test/t/func_like.test
      sql/item_sum.h
 3255 John H. Embretsen	2011-01-17
      Fix for Bug#45730 - Test case disabled in show_check.test due to WL#1324.
      Enabled test snippet for bug 4374, tested on Mac OS X 10.6 as well as Solaris.
      Moved test snippet to a different place in the file, in order to avoid having 
      to save and restore "SET NAMES" setting. New surroundings expect latin1, as is 
      used in the testsnippet.
      
      An extra copy of the commented test snippet is removed, a comment is added,
      SQL keywords are converted to uppercase, and engine name "heap" is updated to 
      "Memory".
      
      Also added Copyright statement and a notice about the file's encoding(s).

    modified:
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
=== modified file 'mysql-test/r/func_like.result'
--- a/mysql-test/r/func_like.result	2010-11-11 10:31:17 +0000
+++ b/mysql-test/r/func_like.result	2011-01-17 09:39:59 +0000
@@ -182,4 +182,9 @@ INSERT INTO t2 VALUES (1), (2), (3);
 SELECT 1 FROM t2 JOIN t1 ON 1 LIKE a GROUP BY a;
 1
 DROP TABLE t1, t2;
+#
+# Bug#59149 valgrind warnings with "like .. escape .." function
+#
+SELECT '' LIKE '1' ESCAPE COUNT(1);
+ERROR HY000: Incorrect arguments to ESCAPE
 End of 5.1 tests

=== modified file 'mysql-test/t/func_like.test'
--- a/mysql-test/t/func_like.test	2010-11-08 10:55:43 +0000
+++ b/mysql-test/t/func_like.test	2011-01-17 09:30:22 +0000
@@ -126,5 +126,10 @@ INSERT INTO t2 VALUES (1), (2), (3);
 SELECT 1 FROM t2 JOIN t1 ON 1 LIKE a GROUP BY a;
 DROP TABLE t1, t2;
 
+--echo #
+--echo # Bug#59149 valgrind warnings with "like .. escape .." function
+--echo #
+--error ER_WRONG_ARGUMENTS
+SELECT '' LIKE '1' ESCAPE COUNT(1);
 
 --echo End of 5.1 tests

=== modified file 'sql/item_sum.h'
--- a/sql/item_sum.h	2010-12-21 11:50:03 +0000
+++ b/sql/item_sum.h	2011-01-17 09:39:59 +0000
@@ -445,6 +445,7 @@ public:  
     forced_const= TRUE; 
   }
   virtual bool const_item() const { return forced_const; }
+  virtual bool const_during_execution() const { return false; }
   virtual void print(String *str, enum_query_type query_type);
   void fix_num_length_and_dec();
 

No bundle (reason: useless for push emails).