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 /storage/spider | |
| 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 'storage/spider')
| -rw-r--r-- | storage/spider/mysql-test/spider/bg/r/spider_fixes.result | 4 | ||||
| -rw-r--r-- | storage/spider/mysql-test/spider/r/spider_fixes.result | 4 | ||||
| -rw-r--r-- | storage/spider/spd_table.cc | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/storage/spider/mysql-test/spider/bg/r/spider_fixes.result b/storage/spider/mysql-test/spider/bg/r/spider_fixes.result index 6db61fa93d2..3033586821e 100644 --- a/storage/spider/mysql-test/spider/bg/r/spider_fixes.result +++ b/storage/spider/mysql-test/spider/bg/r/spider_fixes.result @@ -245,7 +245,7 @@ a b c direct order limit SHOW STATUS LIKE 'Spider_direct_order_limit'; Variable_name Value -Spider_direct_order_limit 0 +Spider_direct_order_limit 2 SELECT a, b, c FROM ta_l_int ORDER BY a LIMIT 3; a b c 1 2 4 @@ -253,7 +253,7 @@ a b c 3 4 5 SHOW STATUS LIKE 'Spider_direct_order_limit'; Variable_name Value -Spider_direct_order_limit 0 +Spider_direct_order_limit 3 2.26 lock tables diff --git a/storage/spider/mysql-test/spider/r/spider_fixes.result b/storage/spider/mysql-test/spider/r/spider_fixes.result index 6db61fa93d2..3033586821e 100644 --- a/storage/spider/mysql-test/spider/r/spider_fixes.result +++ b/storage/spider/mysql-test/spider/r/spider_fixes.result @@ -245,7 +245,7 @@ a b c direct order limit SHOW STATUS LIKE 'Spider_direct_order_limit'; Variable_name Value -Spider_direct_order_limit 0 +Spider_direct_order_limit 2 SELECT a, b, c FROM ta_l_int ORDER BY a LIMIT 3; a b c 1 2 4 @@ -253,7 +253,7 @@ a b c 3 4 5 SHOW STATUS LIKE 'Spider_direct_order_limit'; Variable_name Value -Spider_direct_order_limit 0 +Spider_direct_order_limit 3 2.26 lock tables diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index 2eb852e61a8..0926f45773b 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -7870,12 +7870,6 @@ bool spider_check_direct_order_limit( DBUG_PRINT("info",("spider select_limit=%lld", select_limit)); DBUG_PRINT("info",("spider offset_limit=%lld", offset_limit)); if ( -#if MYSQL_VERSION_ID < 50500 - !thd->variables.engine_condition_pushdown || -#else - !(thd->variables.optimizer_switch & - OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN) || -#endif !select_lex || #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100000 select_lex->leaf_tables.elements != 1 || |