diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-02 15:03:20 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-02 15:03:20 -0800 |
| commit | 8bc5045ea377f39701f421cc7ae00756f79962d2 (patch) | |
| tree | 751d8bbe4d3844ab9dc16d0c07855e40028cbabc /sql/sys_vars.cc | |
| parent | 8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e (diff) | |
| parent | 2521ac0c7f2450d588fa1704a6eef785da8812a9 (diff) | |
| download | mariadb-git-8bc5045ea377f39701f421cc7ae00756f79962d2.tar.gz | |
Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 0e734476242..38456d15860 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1456,6 +1456,7 @@ export const char *optimizer_switch_names[]= "join_cache_bka", "optimize_join_buffer_size", "table_elimination", + "extended_keys", "default", NullS }; /** propagates changes to @@engine_condition_pushdown */ @@ -1496,7 +1497,8 @@ static Sys_var_flagset Sys_optimizer_switch( "semijoin, " "semijoin_with_cache, " "subquery_cache, " - "table_elimination " + "table_elimination, " + "extended_keys " "} and val is one of {on, off, default}", SESSION_VAR(optimizer_switch), CMD_LINE(REQUIRED_ARG), optimizer_switch_names, DEFAULT(OPTIMIZER_SWITCH_DEFAULT), |