summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-11-21 11:46:36 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-11-21 11:46:36 +0400
commit2394fa67d4908f62ef14f3ca90269fb32806d193 (patch)
treef1b54751a653ab37af221f1b22a5368f5ee05ffc /sql/item_timefunc.cc
parentf8a6ee59acb082678cf601a10cbe9c1152748242 (diff)
downloadmariadb-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.cc')
-rw-r--r--sql/item_timefunc.cc21
1 files changed, 0 insertions, 21 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index cb60368aafd..3baf583eaa0 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -1362,27 +1362,6 @@ String *Item_temporal_func::val_str(String *str)
}
-longlong Item_temporal_func::val_int()
-{
- DBUG_ASSERT(fixed == 1);
- MYSQL_TIME ltime;
- if (get_date(&ltime, 0))
- return 0;
- longlong v= TIME_to_ulonglong(&ltime);
- return ltime.neg ? -v : v;
-}
-
-
-double Item_temporal_func::val_real()
-{
- DBUG_ASSERT(fixed == 1);
- MYSQL_TIME ltime;
- if (get_date(&ltime, 0))
- return 0;
- return TIME_to_double(&ltime);
-}
-
-
bool Item_func_from_days::get_date(MYSQL_TIME *ltime, uint fuzzy_date)
{
longlong value=args[0]->val_int();