diff options
| author | unknown <sanja@montyprogram.com> | 2013-01-17 13:53:15 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-01-17 13:53:15 +0200 |
| commit | 8a296e6ca2e55f9f1f3ce25d311291a20ee1c9e7 (patch) | |
| tree | 073a1ea0802da109642459428ffbbfc804864f5b /sql/item.cc | |
| parent | a716b061676d01920fa83298cd1fbb57725d6ad9 (diff) | |
| download | mariadb-git-8a296e6ca2e55f9f1f3ce25d311291a20ee1c9e7.tar.gz | |
backport of:
Don't reset maybe_null in update_used_tables(); This breaks ROLLUP
This fixed failing test in group_by.test
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index aee35b611e7..2e023168f34 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9169,7 +9169,7 @@ void Item_ref::update_used_tables() { if (!get_depended_from()) (*ref)->update_used_tables(); - maybe_null= (*ref)->maybe_null; + maybe_null|= (*ref)->maybe_null; } void Item_direct_view_ref::update_used_tables() |