diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2019-04-25 20:11:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 20:11:37 +0900 |
| commit | 80e8fee90732c4cf2436dde5d02f4edc7824f06b (patch) | |
| tree | 7d9d5df2ca140335905c6e8e2e24fb28e90a7d63 /sql/sql_select.cc | |
| parent | ebf3376677f9803a914cadc034c71ec2881f9eb4 (diff) | |
| parent | ca7fbcea6c4fe13c295cf43b80d05351aba59e95 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-18995.tar.gz | |
Merge branch '10.4' into bb-10.4-MDEV-18995bb-10.4-MDEV-18995
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f96b3409578..df582a1cd14 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7815,6 +7815,10 @@ best_access_path(JOIN *join, DBUG_ASSERT(tmp >= 0); } } + else + { + best_filter= 0; + } loose_scan_opt.check_range_access(join, idx, s->quick); } @@ -13463,8 +13467,10 @@ void JOIN::join_free() void JOIN::cleanup(bool full) { DBUG_ENTER("JOIN::cleanup"); - DBUG_PRINT("enter", ("full %u", (uint) full)); - + DBUG_PRINT("enter", ("select: %d (%p) join: %p full: %u", + select_lex->select_number, select_lex, this, + (uint) full)); + if (full) have_query_plan= QEP_DELETED; |