summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-03-08 10:14:43 +0100
committerSergei Golubchik <sergii@pisem.net>2011-03-08 10:14:43 +0100
commit2c80662d231414eb98b5cd4cede069d1482ccc20 (patch)
tree5f77bee52e409c1e217afbc1e396d110314085e8 /sql/item_timefunc.h
parentb27b5793a0d812cb2be535eadd280134efab22a5 (diff)
downloadmariadb-git-2c80662d231414eb98b5cd4cede069d1482ccc20.tar.gz
lp:731103 Assertion `maybe_null && item->null_value' failed with ORDER BY LAST_DAY()
Item_func_last_day did not set mayby_null=1
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index e2e65142902..36be86cd89c 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -862,4 +862,9 @@ public:
Item_func_last_day(Item *a) :Item_datefunc(a) {}
const char *func_name() const { return "last_day"; }
bool get_date(MYSQL_TIME *res, uint fuzzy_date);
+ void fix_length_and_dec()
+ {
+ maybe_null=1;
+ Item_datefunc::fix_length_and_dec();
+ }
};