diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-25 23:13:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:40 +0200 |
| commit | ab34aecff3c6c9c33ca682c90a79ec60d59f42ed (patch) | |
| tree | 7d8eaecd0ba11b9b5a5b4020276726e8f67a9be8 /sql/records.cc | |
| parent | 686f102eb9a9eb4c9b0f713e532b19409b8bbbe6 (diff) | |
| download | mariadb-git-ab34aecff3c6c9c33ca682c90a79ec60d59f42ed.tar.gz | |
MDEV-6513 deprecate engine_condition_pushdown value of the @@optimizer_switch
* ignore the OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN bit
* issue a deprecation warning on 'engine_condition_pushdown=on'
* remove unused remains of the old pre-5.5 engine_condition_pushdown variable
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/records.cc b/sql/records.cc index 1b230c41156..cbcdb365f40 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -287,8 +287,8 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table, thd->variables.read_buff_size); } /* Condition pushdown to storage engine */ - if ((thd->variables.optimizer_switch & - OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN) && + if ((table->file->ha_table_flags() & + HA_MUST_USE_TABLE_CONDITION_PUSHDOWN) && select && select->cond && (select->cond->used_tables() & table->map) && !table->file->pushed_cond) |