diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-04-27 15:31:12 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-04-27 15:31:56 +0200 |
| commit | 5fd0088356090bed2375cb9a128d51d973dab3eb (patch) | |
| tree | 70886db5ab1c193775156f9b25f571180c86e229 /sql/item.cc | |
| parent | f8320210e78232fed350754faf72d14af63d0c3e (diff) | |
| download | mariadb-git-5fd0088356090bed2375cb9a128d51d973dab3eb.tar.gz | |
MDEV-8058: funcs_1.innodb_views and funcs_1.memory_views fail
The double call of ref used tables fixed.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 59ec3e69102..87336dcc1c5 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9806,12 +9806,14 @@ table_map Item_direct_view_ref::used_tables() const return OUTER_REF_TABLE_BIT; if (view->is_merged_derived() || view->merged || !view->table) - return ((*ref)->used_tables() ? - (*ref)->used_tables() : + { + table_map used= (*ref)->used_tables(); + return (used ? + used : ((null_ref_table != NO_NULL_TABLE) ? null_ref_table->map : (table_map)0 )); - + } return view->table->map; } |