Merge with 4.0.6

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 7c085a1b25a..7e2e8f7cfbd 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -429,7 +429,7 @@ String *Item_date::val_str(String *str)
 }
 
 
-int  Item_date::save_in_field(Field *field)
+int Item_date::save_in_field(Field *field, bool no_conversions)
 {
   TIME ltime;
   timestamp_type t_type=TIMESTAMP_FULL;
@@ -567,7 +567,7 @@ bool Item_func_now::get_date(TIME *res,
 }
 
 
-int  Item_func_now::save_in_field(Field *to)
+int Item_func_now::save_in_field(Field *to, bool no_conversions)
 {
   to->set_notnull();
   to->store_time(&ltime,TIMESTAMP_FULL);