diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:02:21 +0100 |
| commit | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch) | |
| tree | c6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /sql/item_timefunc.h | |
| parent | ff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff) | |
| parent | 6bf10fac445d73fb796d4863612c87bff5f28b66 (diff) | |
| download | mariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz | |
10.0-base merge
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 76f84b88795..cdf03199a81 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -498,8 +498,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); } |