diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-31 06:53:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-31 06:53:45 +0300 |
| commit | db4a27ab738c3ab43173368117583402f995c4f1 (patch) | |
| tree | 01a367ede38cc8ede00038a904c96b76e570de5f /sql/item.h | |
| parent | d1ef02e9592b744d6c8dbca9231152f0a58d4384 (diff) | |
| parent | 396da1a70548f80ecf781cf352b0d4a5740c54f6 (diff) | |
| download | mariadb-git-db4a27ab738c3ab43173368117583402f995c4f1.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 5cda78d42fa..75c0fbc67fe 100644 --- a/sql/item.h +++ b/sql/item.h @@ -3557,6 +3557,8 @@ public: String *val_str(String *str); my_decimal *val_decimal(my_decimal *); bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate); + longlong val_datetime_packed(THD *); + longlong val_time_packed(THD *); int save_in_field(Field *field, bool no_conversions); int save_safe_in_field(Field *field); bool send(Protocol *protocol, st_value *buffer); @@ -5179,6 +5181,8 @@ public: bool val_native(THD *thd, Native *to); bool is_null(); bool get_date(THD *thd, MYSQL_TIME *ltime, date_mode_t fuzzydate); + longlong val_datetime_packed(THD *); + longlong val_time_packed(THD *); double val_result(); longlong val_int_result(); String *str_result(String* tmp); |