mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected fix for the bug#37870.

Browse source
This commit is contained in:
Evgeny Potemkin 2008-10-27 19:19:26 +03:00
parent 170215e696
commit a0ae05079b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/item_cmpfunc.cc
View file

@ -413,11 +413,11 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
/*
Store the value of the field if it references an outer field because
Store the value of the field/constant if it references an outer field because
the call to save_in_field below overrides that value.
Don't store it for EXPLAIN since it's not initialized.
Don't save value of the field for EXPLAIN since it's not initialized.
*/
if (field_item->depended_from && !thd->lex->describe)
if (field_item->depended_from && (!thd->lex->describe || field_item->const_item()))
orig_field_val= field->val_int();
if (!(*item)->is_null() && !(*item)->save_in_field(field, 1))
{
@ -428,7 +428,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
result= 1; // Item was replaced
}
/* Restore the original field value. */
if (field_item->depended_from && !thd->lex->describe)
if (field_item->depended_from && (!thd->lex->describe || field_item->const_item()))
{
result= field->store(orig_field_val, TRUE);
/* orig_field_val must be a valid value that can be restored back. */