diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:09:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:09:08 +0400 |
| commit | c7355b19828c37d8efb9f1d4b5010544aa110bd4 (patch) | |
| tree | b74e960c3447f7c3c876c1262e5703c7dcf75b4f /sql/item_timefunc.h | |
| parent | 160236f880e92d2872d95ce72aab144f08456bcc (diff) | |
| parent | 2394fa67d4908f62ef14f3ca90269fb32806d193 (diff) | |
| download | mariadb-git-c7355b19828c37d8efb9f1d4b5010544aa110bd4.tar.gz | |
Merge 5.3->5.5
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 c54490f45af..c086579e34b 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -499,8 +499,8 @@ public: enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; } Item_result cmp_type() const { return TIME_RESULT; } 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, ulonglong fuzzy_date) { DBUG_ASSERT(0); return 1; } my_decimal *val_decimal(my_decimal *decimal_value) { return val_decimal_from_date(decimal_value); } |