1 files changed, 27 insertions, 3 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index a2204f22822..c021aacf114 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -47,6 +47,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "md5"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -57,6 +58,7 @@ public:
   String *val_str(String *);    
   void fix_length_and_dec();      
   const char *func_name() const { return "sha"; }	
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_aes_encrypt :public Item_str_func
@@ -87,6 +89,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "concat"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_concat_ws :public Item_str_func
@@ -107,6 +110,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "reverse"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -144,6 +148,7 @@ protected:
 public:
   Item_str_conv(Item *item) :Item_str_func(item) {}
   String *val_str(String *);
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -207,6 +212,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "substr"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -218,6 +224,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "substring_index"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -232,6 +239,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "trim"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -430,6 +438,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "soundex"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -465,10 +474,10 @@ public:
   void update_used_tables();
   const char *func_name() const { return "make_set"; }
 
-  bool walk(Item_processor processor, byte *arg)
+  bool walk(Item_processor processor, bool walk_subquery, byte *arg)
   {
-    return item->walk(processor, arg) ||
-      Item_str_func::walk(processor, arg);
+    return item->walk(processor, walk_subquery, arg) ||
+      Item_str_func::walk(processor, walk_subquery, arg);
   }
   Item *transform(Item_transformer transformer, byte *arg)
   {
@@ -537,6 +546,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "rpad"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -549,6 +559,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec();
   const char *func_name() const { return "lpad"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -563,6 +574,7 @@ public:
     collation.set(default_charset());
     max_length= 64;
   }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -579,6 +591,7 @@ public:
     decimals=0;
     max_length=args[0]->max_length*2*collation.collation->mbmaxlen;
   }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_unhex :public Item_str_func
@@ -594,6 +607,7 @@ public:
     decimals=0;
     max_length=(1+args[0]->max_length)/2;
   }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -617,6 +631,7 @@ public:
   }
   void print(String *str);
   const char *func_name() const { return "cast_as_binary"; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 
@@ -656,6 +671,7 @@ public:
   String* val_str(String* str);
   const char *func_name() const { return "inet_ntoa"; }
   void fix_length_and_dec() { decimals = 0; max_length=3*8+7; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_quote :public Item_str_func
@@ -670,6 +686,7 @@ public:
     collation.set(args[0]->collation);
     max_length= args[0]->max_length * 2 + 2;
   }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_conv_charset :public Item_str_func
@@ -713,6 +730,7 @@ public:
   void fix_length_and_dec();
   const char *func_name() const { return "convert"; }
   void print(String *str);
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_set_collation :public Item_str_func
@@ -745,6 +763,7 @@ public:
      maybe_null= 0;
   };
   table_map not_null_tables() const { return 0; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_collation :public Item_str_func
@@ -760,6 +779,7 @@ public:
      maybe_null= 0;
   };
   table_map not_null_tables() const { return 0; }
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_crc32 :public Item_int_func
@@ -770,6 +790,7 @@ public:
   const char *func_name() const { return "crc32"; }
   void fix_length_and_dec() { max_length=10; }
   longlong val_int();
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_uncompressed_length : public Item_int_func
@@ -780,6 +801,7 @@ public:
   const char *func_name() const{return "uncompressed_length";}
   void fix_length_and_dec() { max_length=10; }
   longlong val_int();
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 #ifdef HAVE_COMPRESS
@@ -796,6 +818,7 @@ public:
   void fix_length_and_dec(){max_length= (args[0]->max_length*120)/100+12;}
   const char *func_name() const{return "compress";}
   String *val_str(String *) ZLIB_DEPENDED_FUNCTION
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 class Item_func_uncompress: public Item_str_func
@@ -806,6 +829,7 @@ public:
   void fix_length_and_dec(){max_length= MAX_BLOB_WIDTH;}
   const char *func_name() const{return "uncompress";}
   String *val_str(String *) ZLIB_DEPENDED_FUNCTION
+  bool check_partition_func_processor(byte *bool_arg) { return 0;}
 };
 
 #define UUID_LENGTH (8+1+4+1+4+1+4+1+12)