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/sql_priv.h | |
| 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/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 5dc19181e9b..9578c2fe8df 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -199,7 +199,7 @@ template <class T> bool valid_buffer_range(T jump, #define OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION (1ULL << 2) #define OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT (1ULL << 3) #define OPTIMIZER_SWITCH_INDEX_MERGE_SORT_INTERSECT (1ULL << 4) -#define OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN (1ULL << 5) +#define deprecated_ENGINE_CONDITION_PUSHDOWN (1ULL << 5) #define OPTIMIZER_SWITCH_INDEX_COND_PUSHDOWN (1ULL << 6) #define OPTIMIZER_SWITCH_DERIVED_MERGE (1ULL << 7) #define OPTIMIZER_SWITCH_DERIVED_WITH_KEYS (1ULL << 8) |