diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-11-01 07:00:55 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-11-01 07:00:55 -0700 |
| commit | a70f7aa5fe0b05228aea5bf9673233d857524b0d (patch) | |
| tree | 53f7e1eafa2d490add5166bf90281c65f1113187 /sql/opt_index_cond_pushdown.cc | |
| parent | 0efacfcfb24443bbd342e5c4447b166cb569438c (diff) | |
| download | mariadb-git-a70f7aa5fe0b05228aea5bf9673233d857524b0d.tar.gz | |
Backported the fix and the test case for bug 12822678 from the mysql-5.6 code line.
Fixed a bug in select_describe.
Adjusted results for affected test cases.
Diffstat (limited to 'sql/opt_index_cond_pushdown.cc')
| -rw-r--r-- | sql/opt_index_cond_pushdown.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_index_cond_pushdown.cc b/sql/opt_index_cond_pushdown.cc index 639ceedf693..d63cc200493 100644 --- a/sql/opt_index_cond_pushdown.cc +++ b/sql/opt_index_cond_pushdown.cc @@ -322,7 +322,8 @@ void push_index_cond(JOIN_TAB *tab, uint keyno) HA_DO_INDEX_COND_PUSHDOWN) && optimizer_flag(tab->join->thd, OPTIMIZER_SWITCH_INDEX_COND_PUSHDOWN) && tab->join->thd->lex->sql_command != SQLCOM_UPDATE_MULTI && - tab->join->thd->lex->sql_command != SQLCOM_DELETE_MULTI) + tab->join->thd->lex->sql_command != SQLCOM_DELETE_MULTI && + tab->type != JT_CONST && tab->type != JT_SYSTEM) { DBUG_EXECUTE("where", print_where(tab->select_cond, "full cond", QT_ORDINARY);); |