diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
| commit | 73985d83014e2a484dffac135193a2f0cf715b54 (patch) | |
| tree | 7167799ebc178519babd7000c76234665a9d6030 /sql/item.h | |
| parent | 496532b5c54d69e012f6fc2417e97d61465588f2 (diff) | |
| parent | aade6e53d398dd287ca7e771191c9975099b4fa1 (diff) | |
| download | mariadb-git-73985d83014e2a484dffac135193a2f0cf715b54.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index ff4cfd6c1b8..c3db959fd44 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1503,6 +1503,13 @@ public: uint fuzzydate= TIME_FUZZY_DATES | TIME_INVALID_DATES | TIME_TIME_ONLY; return get_date(<ime, fuzzydate) ? 0 : pack_time(<ime); } + longlong val_datetime_packed_result(); + longlong val_time_packed_result() + { + MYSQL_TIME ltime; + uint fuzzydate= TIME_TIME_ONLY | TIME_INVALID_DATES | TIME_FUZZY_DATES; + return get_date_result(<ime, fuzzydate) ? 0 : pack_time(<ime); + } // Get a temporal value in packed DATE/DATETIME or TIME format longlong val_temporal_packed(enum_field_types f_type) { |