diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 15:50:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 18:30:29 +0100 |
| commit | 67240858b2bfa0afc436d88fc9da0595e1391b60 (patch) | |
| tree | 27dc23ebefa72cb2fd7aaa02722da3ba424bbf9e /sql/sql_select.cc | |
| parent | cf9070a8f7dec309878e464b277db7dbb3556cf0 (diff) | |
| parent | aeefd26ecb1089678e343c64998749e9f2e3a1e4 (diff) | |
| download | mariadb-git-67240858b2bfa0afc436d88fc9da0595e1391b60.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.21
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 221bdc9480c..b1ae11fef03 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19639,6 +19639,10 @@ test_if_quick_select(JOIN_TAB *tab) delete tab->select->quick; tab->select->quick=0; + + if (tab->table->file->inited != handler::NONE) + tab->table->file->ha_index_or_rnd_end(); + int res= tab->select->test_quick_select(tab->join->thd, tab->keys, (table_map) 0, HA_POS_ERROR, 0, FALSE, /*remove where parts*/FALSE); |