summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-27 23:36:20 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-27 23:36:20 -0700
commit5ce5e8db92ab04086f0a0f634eec78634f21ff3a (patch)
tree167852ffa7d33eac0300f242c18ff06e3ef0edc4 /sql/table.cc
parent32b3272bb7265e19b7342bc927e2b7bd80b7afa2 (diff)
parent9c4a3ced112c7654ca7b7bb8eb69e79ee7060bb0 (diff)
downloadmariadb-git-5ce5e8db92ab04086f0a0f634eec78634f21ff3a.tar.gz
Merge
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index bf8e0e46661..d61ab15e957 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -4537,7 +4537,7 @@ Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
Force creation of nullable item for the result tmp table for outer joined
views/derived tables.
*/
- if (view->outer_join)
+ if (view->table && view->table->maybe_null)
item->maybe_null= TRUE;
/* Save item in case we will need to fall back to materialization. */
view->used_items.push_back(item);