summaryrefslogtreecommitdiff
path: root/sql/item_row.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-23 15:18:05 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-23 15:18:05 -0800
commit32151409c13ddc09ebda7cd02fdfe40db290503e (patch)
tree86997a41bbc6c4379209af0cccdb4ae612c8d4f4 /sql/item_row.cc
parentf1e758dc6f4183a8e3856d21c95f7e4973c585c1 (diff)
parent746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff)
downloadmariadb-git-32151409c13ddc09ebda7cd02fdfe40db290503e.tar.gz
Merge 5.3->5.5
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 2c4a628075e..cfd2f34095c 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -145,11 +145,13 @@ void Item_row::update_used_tables()
{
used_tables_cache= 0;
const_item_cache= 1;
+ maybe_null= 0;
for (uint i= 0; i < arg_count; i++)
{
items[i]->update_used_tables();
used_tables_cache|= items[i]->used_tables();
const_item_cache&= items[i]->const_item();
+ maybe_null|= items[i]->maybe_null;
}
}