bzr push into mysql-trunk branch (hezx:3518 to 3519)

[He Zhenxing]

 3519 He Zhenxing	2011-01-17 [merge]
      Auto merge

    modified:
      mysql-test/r/func_like.result
      mysql-test/t/func_like.test
      sql/item_sum.h
 3518 He Zhenxing	2011-01-17 [merge]
      Auto merge

    modified:
      extra/my_print_defaults.c
      include/my_sys.h
      mysys/default.c
      mysys/my_getopt.c
      sql-common/client.c
      sql/mysqld.cc
      storage/ndb/test/run-test/setup.cpp
=== 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 12:27:36 +0000
+++ b/sql/item_sum.h	2011-01-17 10:00:13 +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();
 


Attachment: [text/bzr-bundle] bzr/[e-mail]