diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-06-27 23:40:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-06-27 23:40:58 +0400 |
| commit | a28c8a3cf7fa9188d8f1a21de9566f69109ee0a9 (patch) | |
| tree | 0eecc858dde556e439a40afd206cd416e6e42efd /sql/table.cc | |
| parent | cb164640be1afda99b708cb778adca5834957ac3 (diff) | |
| parent | c25728cdd91ac15c2715cdde064fb3645657a70a (diff) | |
| download | mariadb-git-a28c8a3cf7fa9188d8f1a21de9566f69109ee0a9.tar.gz | |
Merge semi-join+outer-join fixes into 5.3
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 2d2311d8987..b800d29cd5e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -5410,9 +5410,11 @@ bool st_table::is_children_attached(void) bool st_table::is_filled_at_execution() { - return test(pos_in_table_list->jtbm_subselect); + return test(pos_in_table_list->jtbm_subselect || + pos_in_table_list->is_active_sjm()); } + /* Cleanup this table for re-execution. |