diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-12 14:34:54 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-12 14:34:54 +0200 |
| commit | 4976cd5529fb0fe19891a7ef3bc7ff68146bf6a3 (patch) | |
| tree | fa15763d811c418cefae92a3f790e6e785618918 /sql/field.h | |
| parent | ab3c0ac156946ff9a6ef94b3cc987f02f940465a (diff) | |
| download | mariadb-git-4976cd5529fb0fe19891a7ef3bc7ff68146bf6a3.tar.gz | |
Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)
sql/field.cc:
Fix for --new option
sql/field.h:
Fix for --new option
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 29c185505c7..842bbb89988 100644 --- a/sql/field.h +++ b/sql/field.h @@ -541,7 +541,7 @@ public: Field_timestamp(char *ptr_arg, uint32 len_arg, enum utype unireg_check_arg, const char *field_name_arg, struct st_table *table_arg); - enum Item_result result_type () const { return field_length == 8 || field_length == 14 ? INT_RESULT : STRING_RESULT; } + enum Item_result result_type () const; enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;} enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; } void store(const char *to,uint length); @@ -575,6 +575,7 @@ public: void fill_and_store(char *from,uint len); bool get_date(TIME *ltime,bool fuzzydate); bool get_time(TIME *ltime); + void make_field(Send_field *field); }; |