diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-12-29 23:44:45 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-29 23:44:45 +0100 |
commit | aeefd26ecb1089678e343c64998749e9f2e3a1e4 (patch) | |
tree | a96f5fdff65a6d0a05d195a74a32bbb4aa0a58c1 /sql/sql_select.cc | |
parent | 50c9469be821e1942a8a9c5f37132e1855c40c86 (diff) | |
parent | 802ce9672ff630bbef08235e0e39bf599075f985 (diff) | |
download | mariadb-git-aeefd26ecb1089678e343c64998749e9f2e3a1e4.tar.gz |
Merge branch '10.0' into 10.1
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 62f40eeb99c..155e261ac34 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19361,6 +19361,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); |