diff options
| author | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
| commit | 0bb0d52221af99c46d17486382806caa6dd7338e (patch) | |
| tree | 92b2ddfceaf8df5be6d47774b25fd3006ac5bb35 /sql/item_sum.h | |
| parent | 7dbff2c513aeec3b3f3d0fa4952ae97deba22282 (diff) | |
| parent | d40c23570ff1a9ba5aa317b85a32a4b27780b8ab (diff) | |
| download | mariadb-git-0bb0d52221af99c46d17486382806caa6dd7338e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_recursive.result
mysql-test/r/derived_cond_pushdown.result
mysql-test/t/cte_recursive.test
mysql-test/t/derived_cond_pushdown.test
sql/datadict.cc
sql/handler.cc
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 7845ed3318f..0cb5be391a2 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1034,6 +1034,7 @@ protected: double val_real(); longlong val_int(); my_decimal *val_decimal(my_decimal *); + bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); void reset_field(); String *val_str(String *); const Type_handler *real_type_handler() const |