summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-11-29 23:06:39 +0200
committerunknown <timour@askmonty.org>2011-11-29 23:06:39 +0200
commit625cdb8078550d30399209d58edcb38cdfcc411d (patch)
treee56a27a1d6213a6b593d050f085f249bbe894a93 /sql
parentcdde6187d1d2e7f407043f73376c266f540217d9 (diff)
downloadmariadb-git-625cdb8078550d30399209d58edcb38cdfcc411d.tar.gz
Fixed bug lp:825051
The cause of the wrong result was that Item_ref_null_helper::get_date() didn't use a method of the *_result() family, and fetched the data for the field from the current row instead of result_field. Changed to use the correct *_result() method, like to all other similar methods of Item_ref_null_helper.
Diffstat (limited to 'sql')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 9ba93780334..b0cd5b1388a 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3864,7 +3864,7 @@ String* Item_ref_null_helper::val_str(String* s)
bool Item_ref_null_helper::get_date(MYSQL_TIME *ltime, uint fuzzydate)
{
- return (owner->was_null|= null_value= (*ref)->get_date(ltime, fuzzydate));
+ return (owner->was_null|= null_value= (*ref)->get_date_result(ltime, fuzzydate));
}