summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-02 15:22:47 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-02 15:22:47 +0200
commitbeec2a2b1d79eb7f689ee083fe68d08682b14300 (patch)
tree27b220f4a99673f17901d874f138f9bcde91f061 /sql/item.cc
parent6920491587b9ef4c1e46b0401038244c3bb64c7a (diff)
downloadmariadb-git-beec2a2b1d79eb7f689ee083fe68d08682b14300.tar.gz
MDEV-241 lp:992722 - Server crashes in get_datetime_value
Create an Item_cache based on item's cmp_type, not result_type in subselect_engine. Use result_field in Item_cache_temporal::cache_value(), just like all other Item_cache*::cache_value() do.
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 70c5798eb6c..4e57221c0a6 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -8329,7 +8329,7 @@ bool Item_cache_temporal::cache_value()
value_cached= true;
MYSQL_TIME ltime;
- if (example->get_date(&ltime, TIME_FUZZY_DATE))
+ if (example->get_date_result(&ltime, TIME_FUZZY_DATE))
value=0;
else
value= pack_time(&ltime);