summaryrefslogtreecommitdiff
path: root/sql/item_row.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2003-01-02 12:24:33 +0200
committerbell@sanja.is.com.ua <>2003-01-02 12:24:33 +0200
commit945758f0ec2f91eeb680394296bf1a50f8b82523 (patch)
tree97814f92c58bdd329bfaa1a60725d7be46326137 /sql/item_row.cc
parentaedd600401585b0719d64acae560836d6fc83c12 (diff)
downloadmariadb-git-945758f0ec2f91eeb680394296bf1a50f8b82523.tar.gz
post-post-review fix (SCRUM)
Diffstat (limited to 'sql/item_row.cc')
-rw-r--r--sql/item_row.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc
index ba4ac19b880..c62ab60c0cd 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -55,6 +55,7 @@ bool Item_row::fix_fields(THD *thd, TABLE_LIST *tabl, Item **ref)
return 1;
used_tables_cache |= items[i]->used_tables();
if (const_item_cache&= items[i]->const_item() && !with_null)
+ {
if (items[i]->cols() > 1)
with_null|= items[i]->null_inside();
else
@@ -62,6 +63,7 @@ bool Item_row::fix_fields(THD *thd, TABLE_LIST *tabl, Item **ref)
items[i]->val_int();
with_null|= items[i]->null_value;
}
+ }
maybe_null|= items[i]->maybe_null;
}
return 0;