diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-10 09:39:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-10 09:39:14 +0100 |
| commit | 41d432462b905207b9a1cf51d2fcc88a7b09dd35 (patch) | |
| tree | c046292241c90cdf078c49c93539a78e80094ea0 /sql/item_row.cc | |
| parent | d4a3a7b90ef06cb3eaf68317c42020e2980d3777 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-41d432462b905207b9a1cf51d2fcc88a7b09dd35.tar.gz | |
merge 5.2
Diffstat (limited to 'sql/item_row.cc')
| -rw-r--r-- | sql/item_row.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index 7535c1fa80b..408bc11eb9b 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -73,12 +73,8 @@ bool Item_row::fix_fields(THD *thd, Item **ref) used_tables_cache |= item->used_tables(); const_item_cache&= item->const_item() && !with_null; not_null_tables_cache|= item->not_null_tables(); - /* - Some subqueries transformations aren't done in the view_prepare_mode thus - is_null() will fail. So we skip is_null() calculation for CREATE VIEW as - not necessary. - */ - if (const_item_cache && !thd->lex->view_prepare_mode) + + if (const_item_cache) { if (item->cols() > 1) with_null|= item->null_inside(); |