Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1

into  dator6.(none):/home/mikael/mysql_clones/bug18198

1 files changed, 4 insertions, 6 deletions

diff --git a/sql/item.h b/sql/item.h
index daa69b8a125..2c380fc2f69 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -843,8 +843,7 @@ public:
     german character for double s is equal to 2 s.
 
     The default is that an item is not allowed
-    in a partition function. However all mathematical functions, string
-    manipulation functions, date functions are allowed. Allowed functions
+    in a partition function. Allowed functions
     can never depend on server version, they cannot depend on anything
     related to the environment. They can also only depend on a set of
     fields in the table itself. They cannot depend on other tables and
@@ -1628,6 +1627,7 @@ public:
   uint decimal_precision() const
   { return (uint)(max_length - test(value < 0)); }
   bool eq(const Item *, bool binary_cmp) const;
+  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
 };
 
 
@@ -1645,6 +1645,7 @@ public:
   void print(String *str);
   Item_num *neg ();
   uint decimal_precision() const { return max_length; }
+  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
 };
 
 
@@ -1687,6 +1688,7 @@ public:
   uint decimal_precision() const { return decimal_value.precision(); }
   bool eq(const Item *, bool binary_cmp) const;
   void set_decimal_value(my_decimal *value_par);
+  bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
 };
 
 
@@ -1747,7 +1749,6 @@ public:
   {}
   void print(String *str) { str->append(func_name); }
   Item *safe_charset_converter(CHARSET_INFO *tocs);
-  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };
 
 
@@ -1856,7 +1857,6 @@ public:
                                   CHARSET_INFO *cs= NULL):
     Item_string(name, length, cs)
   {}
-  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };
 
 
@@ -1904,7 +1904,6 @@ public:
     unsigned_flag=1;
   }
   enum_field_types field_type() const { return int_field_type; }
-  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };
 
 
@@ -2230,7 +2229,6 @@ public:
   }
   Item *clone_item();
   virtual Item *real_item() { return ref; }
-  bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
 };
 
 #ifdef MYSQL_SERVER