diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-01-14 15:23:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-01-14 15:23:10 +0400 |
| commit | d97a26a67dca82d166e9edefe5f950ea8a110dfd (patch) | |
| tree | 5f03eb7a6d55d781ca9c2adab60c99b2f0bfb3bf /sql/item_subselect.cc | |
| parent | ac9b818c241cf59adbe3e9bd8d252736d23c671f (diff) | |
| download | mariadb-git-d97a26a67dca82d166e9edefe5f950ea8a110dfd.tar.gz | |
MDEV-18145 Assertion `0' failed in Item::val_native upon SELECT subquery with timestamp
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 9c0fd057d0f..0ace59fd2fc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1084,7 +1084,7 @@ void Item_maxmin_subselect::no_rows_in_result() */ if (parsing_place != SELECT_LIST || const_item()) return; - value= (new (thd->mem_root) Item_null(thd))->get_cache(thd); + value= get_cache(thd); null_value= 0; was_values= 0; make_const(); @@ -1102,7 +1102,7 @@ void Item_singlerow_subselect::no_rows_in_result() */ if (parsing_place != SELECT_LIST || const_item()) return; - value= (new (thd->mem_root) Item_null(thd))->get_cache(thd); + value= get_cache(thd); reset(); make_const(); } |