diff options
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 88a1b2f6da6..4acd0cf8861 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1040,20 +1040,20 @@ static Sys_var_ulong Sys_max_allowed_packet( BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_max_allowed_packet)); -static Sys_var_ulonglong Sys_max_binlog_cache_size( +static Sys_var_ulong Sys_max_binlog_cache_size( "max_binlog_cache_size", "Sets the total size of the transactional cache", GLOBAL_VAR(max_binlog_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONGLONG_MAX), - DEFAULT((ULONGLONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONG_MAX), + DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); -static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size( +static Sys_var_ulong Sys_max_binlog_stmt_cache_size( "max_binlog_stmt_cache_size", "Sets the total size of the statement cache", GLOBAL_VAR(max_binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONGLONG_MAX), - DEFAULT((ULONGLONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONG_MAX), + DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); static bool fix_max_binlog_size(sys_var *self, THD *thd, enum_var_type type) @@ -1977,7 +1977,7 @@ static Sys_var_ulong Sys_sort_buffer( VALID_RANGE(MIN_SORT_MEMORY, ULONG_MAX), DEFAULT(MAX_SORT_MEMORY), BLOCK_SIZE(1)); -export ulong expand_sql_mode(ulonglong sql_mode) +export ulonglong expand_sql_mode(ulonglong sql_mode) { if (sql_mode & MODE_ANSI) { @@ -2064,7 +2064,7 @@ static const char *sql_mode_names[]= "PAD_CHAR_TO_FULL_LENGTH", 0 }; -export bool sql_mode_string_representation(THD *thd, ulong sql_mode, +export bool sql_mode_string_representation(THD *thd, ulonglong sql_mode, LEX_STRING *ls) { set_to_string(thd, ls, sql_mode, sql_mode_names); |