diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-09-08 12:37:09 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-09-08 12:37:09 +0300 |
| commit | 0ab24bef29c1a31bcf84a27d866a157241e1b605 (patch) | |
| tree | 15a5fd16273d9df34c6c4b2d82d2f10707d3467d /sql/sql_select.cc | |
| parent | 0a7e41864c95cbdec512cc9f1078ace09528d0b7 (diff) | |
| parent | 629557ff13e28e3422dfa1c354c44ef2fd62e4d0 (diff) | |
| download | mariadb-git-0ab24bef29c1a31bcf84a27d866a157241e1b605.tar.gz | |
automerge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8b9a8cf19a1..8b1e0ae365b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1523,12 +1523,8 @@ JOIN::optimize() } } - /* - If this join belongs to an uncacheable subquery save - the original join - */ - if (select_lex->uncacheable && !is_top_level_join() && - init_save_join_tab()) + /* If this join belongs to an uncacheable query save the original join */ + if (select_lex->uncacheable && init_save_join_tab()) DBUG_RETURN(-1); /* purecov: inspected */ } |