diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
| commit | e6bf102466847e992c8cec894b7ef6bb7a971c8b (patch) | |
| tree | fefb04085998222a7c9fcd629b204667e76e3a20 /sql/item_row.cc | |
| parent | 8d311a855164416744c35742a3e1368c49ca6c1a (diff) | |
| parent | fcb83cbf15653bbed15936d8eafb4fc7de3e743b (diff) | |
| download | mariadb-git-e6bf102466847e992c8cec894b7ef6bb7a971c8b.tar.gz | |
5.1-bugteam->5.5-bugteam merge
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 2fbf0c12499..94515640625 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -80,12 +80,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(); |