diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 11:46:36 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 11:46:36 +0400 |
| commit | 2394fa67d4908f62ef14f3ca90269fb32806d193 (patch) | |
| tree | f1b54751a653ab37af221f1b22a5368f5ee05ffc /sql/item_timefunc.h | |
| parent | f8a6ee59acb082678cf601a10cbe9c1152748242 (diff) | |
| download | mariadb-git-2394fa67d4908f62ef14f3ca90269fb32806d193.tar.gz | |
MDEV-4859 Wrong value and data type of "SELECT MAX(time_column) + 1 FROM t1"
Fixed.
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 bc048e1ff64..d97a5fbc903 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -448,8 +448,8 @@ public: enum Item_result result_type () const { return STRING_RESULT; } enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; } String *val_str(String *str); - longlong val_int(); - double val_real(); + longlong val_int() { return val_int_from_date(); } + double val_real() { return val_real_from_date(); } bool get_date(MYSQL_TIME *res, uint fuzzy_date) { DBUG_ASSERT(0); return 1; } my_decimal *val_decimal(my_decimal *decimal_value) { return val_decimal_from_date(decimal_value); } |