Change of internal key_field=NULL handling to avoid error messages.

Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index c0255e71d27..0ca2a36609d 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -231,7 +231,7 @@ public:
   double val() { return (double) val_int(); }
   const char *func_name() const { return "date"; }
   void fix_length_and_dec() { decimals=0; max_length=10; }
-  bool save_in_field(Field *to);
+  bool save_in_field(Field *to, bool no_conversions);
   void make_field(Send_field *tmp_field)
   {
     init_make_field(tmp_field,FIELD_TYPE_DATE);
@@ -316,7 +316,7 @@ public:
   enum Item_result result_type () const { return STRING_RESULT; }
   double val()	     { return (double) value; }
   longlong val_int() { return value; }
-  bool save_in_field(Field *to);
+  bool save_in_field(Field *to, bool no_conversions);
   String *val_str(String *str)
   { str_value.set(buff,buff_length); return &str_value; }
   const char *func_name() const { return "now"; }