summaryrefslogtreecommitdiff
path: root/sql/item_row.cc
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-09-25 21:07:06 +0300
committerunknown <sanja@askmonty.org>2013-09-25 21:07:06 +0300
commit9d83468e78ba23f024ce3c11443913ad75cf1ea5 (patch)
tree0cef7fa6a3fd2e47fe22d105b2b8bbfe1b5a03e0 /sql/item_row.cc
parent2fe0836eed16ce5809c34064893681f12c77da9f (diff)
parent64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (diff)
downloadmariadb-git-9d83468e78ba23f024ce3c11443913ad75cf1ea5.tar.gz
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/item_row.cc')
-rw-r--r--sql/item_row.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc
index 03b460e3ada..6345eaa864b 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -146,13 +146,11 @@ 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;
}
}