• Guilhem Bichot's avatar
    WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" · f5c335ea
    Guilhem Bichot authored
    "set engine_condition_pushdown" is deprecated, engine condition pushdown is controlled
    by a new "set optimizer_switch=engine_condition_pushdown=on|off".
    
    mysql-test/r/index_merge_myisam.result:
      @@optimizer_switch has a new flag
    mysql-test/r/mysqld--help-notwin.result:
      @@optimizer_switch has a new flag
    mysql-test/r/mysqld--help-win.result:
      @@optimizer_switch has a new flag
    mysql-test/r/optimizer_switch_eng_cond_pushdown1.result:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    mysql-test/r/optimizer_switch_eng_cond_pushdown2.result:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/ndb/r/ndb_gis.result:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/ndb/r/ndb_index_unique.result:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/ndb/t/ndb_gis.test:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/ndb/t/ndb_index_unique.test:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result:
      Setting @@engine_condition_pushdown gives a deprecation warning now.
      We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
      influence each other (turning the flag on/off sets the variable on/off and vice-versa).
    mysql-test/suite/sys_vars/r/optimizer_switch_basic.result:
      @@optimizer_switch has a new flag
    mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test:
      Setting @@engine_condition_pushdown gives a deprecation warning now.
      We test that the engine_condition_pushdown flag of @@optimizer_switch, and @@engine_condition_pushdown
      influence each other (turning the flag on/off sets the variable on/off and vice-versa).
    mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    mysql-test/t/optimizer_switch_eng_cond_pushdown1.test:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    mysql-test/t/optimizer_switch_eng_cond_pushdown2.test:
      Check how --engine-condition-pushdown and --optimizer-switch influence each other when used together (last wins).
    sql/mysql_priv.h:
      new "engine_condition_pushdown" switch in @@optimizer_switch, on by default, like
      @@engine_condition_pushdown is on by default. Constants are ULL because optimizer_switch
      is stored in a ulonglong.
    sql/mysqld.cc:
      Making --engine-condition-pushdown and --optimizer-switch (command-line options)
      influence each other (last wins)
    sql/records.cc:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    sql/sql_select.cc:
      @@engine_condition_pushdown is deprecated, use @@optimizer_switch instead
    sql/sys_vars.cc:
      Setting @@engine_condition_pushdown now issues a deprecation message. The version for removal
      is unknown at this point so I copied it from other deprecation warnings in this file.
      Turning on/off the engine_condition_pushdown flag of @@optimizer_switch (with SET) turns on/off the @@engine_condition_pushdown variable, and vice-versa, thanks to fix_* functions.
    f5c335ea
ndb_index_unique.result 13 KB