1 files changed, 14 insertions, 24 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index c021aacf114..6f954744fc0 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -47,7 +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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -58,7 +58,6 @@ 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
@@ -89,7 +88,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 class Item_func_concat_ws :public Item_str_func
@@ -110,7 +109,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -148,7 +147,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -212,7 +211,6 @@ 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;}
 };
 
 
@@ -224,7 +222,6 @@ 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;}
 };
 
 
@@ -239,7 +236,6 @@ 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;}
 };
 
 
@@ -438,7 +434,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -546,7 +542,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -559,7 +555,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -574,7 +570,7 @@ public:
     collation.set(default_charset());
     max_length= 64;
   }
-  bool check_partition_func_processor(byte *bool_arg) { return 0;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -591,7 +587,7 @@ public:
     decimals=0;
     max_length=args[0]->max_length*2*collation.collation->mbmaxlen;
   }
-  bool check_partition_func_processor(byte *bool_arg) { return 0;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 class Item_func_unhex :public Item_str_func
@@ -607,7 +603,7 @@ public:
     decimals=0;
     max_length=(1+args[0]->max_length)/2;
   }
-  bool check_partition_func_processor(byte *bool_arg) { return 0;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -631,7 +627,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 
@@ -671,7 +667,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 class Item_func_quote :public Item_str_func
@@ -686,7 +682,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 class Item_func_conv_charset :public Item_str_func
@@ -730,7 +726,6 @@ 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
@@ -763,7 +758,6 @@ 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
@@ -779,7 +773,6 @@ 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
@@ -790,7 +783,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;}
+  bool check_partition_func_processor(byte *int_arg) { return FALSE; }
 };
 
 class Item_func_uncompressed_length : public Item_int_func
@@ -801,7 +794,6 @@ 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
@@ -818,7 +810,6 @@ 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
@@ -829,7 +820,6 @@ 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)