diff options
| author | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
| commit | 859b68847666823baa328c5c7f3da96787807bb3 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /sql/item_timefunc.h | |
| parent | 564487d7c00098e8a37c8e675197414667685452 (diff) | |
| parent | 496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff) | |
| download | mariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz | |
Merge with 4.0.6
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index f9b987324f0..40397351c18 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -325,7 +325,7 @@ public: decimals=0; max_length=10*thd_charset()->mbmaxlen; } - int save_in_field(Field *to); + int save_in_field(Field *to, bool no_conversions); void make_field(Send_field *tmp_field) { init_make_field(tmp_field,FIELD_TYPE_DATE); @@ -406,7 +406,7 @@ public: enum Item_result result_type () const { return STRING_RESULT; } double val() { return (double) value; } longlong val_int() { return value; } - int save_in_field(Field *to); + int save_in_field(Field *to, bool no_conversions); String *val_str(String *str); const char *func_name() const { return "now"; } void fix_length_and_dec(); |