diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-27 17:22:23 +0300 |
| commit | aa67a198e8a29f2fdae84846cc1d8e74c2d47a83 (patch) | |
| tree | 47719240f2509a3fa373f54852b54d552ac6e844 /sql/sys_vars.cc | |
| parent | 9ebda8764d2e94096924c0a0181f5773d836114a (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-aa67a198e8a29f2fdae84846cc1d8e74c2d47a83.tar.gz | |
automatic merge with 5.5
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ba37f88fdf8..4df3773e5ce 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2246,7 +2246,7 @@ static char *system_time_zone_ptr; static Sys_var_charptr Sys_system_time_zone( "system_time_zone", "The server system time zone", READ_ONLY GLOBAL_VAR(system_time_zone_ptr), NO_CMD_LINE, - IN_FS_CHARSET, DEFAULT(system_time_zone)); + IN_SYSTEM_CHARSET, DEFAULT(system_time_zone)); static Sys_var_ulong Sys_table_def_size( "table_definition_cache", @@ -3768,4 +3768,9 @@ static Sys_var_ulong Sys_debug_binlog_fsync_sleep( CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); #endif - +static Sys_var_harows Sys_expensive_subquery_limit( + "expensive_subquery_limit", + "The maximum number of rows a subquery may examine in order to be " + "executed during optimization and used for constant optimization", + SESSION_VAR(expensive_subquery_limit), CMD_LINE(REQUIRED_ARG), + VALID_RANGE(0, HA_POS_ERROR), DEFAULT(100), BLOCK_SIZE(1)); |