Skip to content

M
mariadb
Commit c3f2224f authored by unknown's avatar unknown
Browse files
Options

Adjustments after the merge for bug 23478.

parent 5676602f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sql/item_subselect.cc
View file @ c3f2224f
...@@ -729,6 +729,7 @@ String *Item_in_subselect::val_str(String *str) ...@@ -729,6 +729,7 @@ String *Item_in_subselect::val_str(String *str)
bool Item_in_subselect::val_bool() bool Item_in_subselect::val_bool()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
null_value= 0;
if (exec()) if (exec())
{ {
reset(); reset();
...@@ -747,6 +748,7 @@ my_decimal *Item_in_subselect::val_decimal(my_decimal *decimal_value) ...@@ -747,6 +748,7 @@ my_decimal *Item_in_subselect::val_decimal(my_decimal *decimal_value)
method should not be used method should not be used
*/ */
DBUG_ASSERT(0); DBUG_ASSERT(0);
null_value= 0;
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
if (exec()) if (exec())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7