merge

1 files changed, 5 insertions, 5 deletions

diff --git a/sql/item.h b/sql/item.h
index 6d10c6a6076..d86e64eac09 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1092,11 +1092,11 @@ public:
   virtual bool set_no_const_sub(uchar *arg) { return FALSE; }
   virtual Item *replace_equal_field(uchar * arg) { return this; }
   /*
-    Check if an expression value depends on the current timezone. Used by
-    partitioning code to reject timezone-dependent expressions in a
-    (sub)partitioning function.
+    Check if an expression value has allowed arguments, like DATE/DATETIME
+    for date functions. Also used by partitioning code to reject
+    timezone-dependent expressions in a (sub)partitioning function.
   */
-  virtual bool is_timezone_dependent_processor(uchar *bool_arg)
+  virtual bool check_valid_arguments_processor(uchar *bool_arg)
   {
     return FALSE;
   }
@@ -1231,7 +1231,7 @@ public:
       maybe_null= 1;
     }
     else
-      max_length= max_result_length;
+      max_length= (uint32) max_result_length;
   }
   void fix_length_and_charset_datetime(uint32 max_char_length_arg)
   {