Commit aa4c7dea authored by Michael Widenius's avatar Michael Widenius

Increase default value of max_binlog_cache_size and max_binlog_stmt_cache_size to ulonglong_max.

This fixes that by default LOAD DATA INFILE will not generate the error:
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage..."


mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result:
  Updated test case
mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result:
  Updated test case
sql/sys_vars.cc:
  Increase default value of max_binlog_cache_size and max_binlog_stmt_cache_size to ulonglong_max.
parent 4494c804
SET @start_value = @@global.max_binlog_cache_size; SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value; SELECT @start_value;
@start_value @start_value
4294963200 18446744073709547520
'#--------------------FN_DYNVARS_072_01------------------------#' '#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000; SET @@global.max_binlog_cache_size = 5000;
Warnings: Warnings:
...@@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_cache_size value: '5000' ...@@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_cache_size value: '5000'
SET @@global.max_binlog_cache_size = DEFAULT; SET @@global.max_binlog_cache_size = DEFAULT;
SELECT @@global.max_binlog_cache_size; SELECT @@global.max_binlog_cache_size;
@@global.max_binlog_cache_size @@global.max_binlog_cache_size
4294963200 18446744073709547520
'#---------------------FN_DYNVARS_072_02-------------------------#' '#---------------------FN_DYNVARS_072_02-------------------------#'
SET @@global.max_binlog_cache_size = @start_value; SET @@global.max_binlog_cache_size = @start_value;
SELECT @@global.max_binlog_cache_size = 4294967295; SELECT @@global.max_binlog_cache_size = 4294967295;
...@@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list' ...@@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list'
SET @@global.max_binlog_cache_size = @start_value; SET @@global.max_binlog_cache_size = @start_value;
SELECT @@global.max_binlog_cache_size; SELECT @@global.max_binlog_cache_size;
@@global.max_binlog_cache_size @@global.max_binlog_cache_size
4294963200 18446744073709547520
SET @start_value = @@global.max_binlog_stmt_cache_size; SET @start_value = @@global.max_binlog_stmt_cache_size;
SELECT @start_value; SELECT @start_value;
@start_value @start_value
4294963200 18446744073709547520
'#--------------------FN_DYNVARS_072_01------------------------#' '#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_stmt_cache_size = 5000; SET @@global.max_binlog_stmt_cache_size = 5000;
Warnings: Warnings:
...@@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '5000' ...@@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '5000'
SET @@global.max_binlog_stmt_cache_size = DEFAULT; SET @@global.max_binlog_stmt_cache_size = DEFAULT;
SELECT @@global.max_binlog_stmt_cache_size; SELECT @@global.max_binlog_stmt_cache_size;
@@global.max_binlog_stmt_cache_size @@global.max_binlog_stmt_cache_size
4294963200 18446744073709547520
'#---------------------FN_DYNVARS_072_02-------------------------#' '#---------------------FN_DYNVARS_072_02-------------------------#'
SET @@global.max_binlog_stmt_cache_size = @start_value; SET @@global.max_binlog_stmt_cache_size = @start_value;
SELECT @@global.max_binlog_stmt_cache_size = 4294967295; SELECT @@global.max_binlog_stmt_cache_size = 4294967295;
...@@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'field list' ...@@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'field list'
SET @@global.max_binlog_stmt_cache_size = @start_value; SET @@global.max_binlog_stmt_cache_size = @start_value;
SELECT @@global.max_binlog_stmt_cache_size; SELECT @@global.max_binlog_stmt_cache_size;
@@global.max_binlog_stmt_cache_size @@global.max_binlog_stmt_cache_size
4294963200 18446744073709547520
...@@ -1068,7 +1068,7 @@ static Sys_var_ulonglong Sys_max_binlog_cache_size( ...@@ -1068,7 +1068,7 @@ static Sys_var_ulonglong Sys_max_binlog_cache_size(
"Sets the total size of the transactional cache", "Sets the total size of the transactional cache",
GLOBAL_VAR(max_binlog_cache_size), CMD_LINE(REQUIRED_ARG), GLOBAL_VAR(max_binlog_cache_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(IO_SIZE, ULONGLONG_MAX), VALID_RANGE(IO_SIZE, ULONGLONG_MAX),
DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), DEFAULT((ULONGLONG_MAX/IO_SIZE)*IO_SIZE),
BLOCK_SIZE(IO_SIZE)); BLOCK_SIZE(IO_SIZE));
static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size( static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size(
...@@ -1076,7 +1076,7 @@ static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size( ...@@ -1076,7 +1076,7 @@ static Sys_var_ulonglong Sys_max_binlog_stmt_cache_size(
"Sets the total size of the statement cache", "Sets the total size of the statement cache",
GLOBAL_VAR(max_binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG), GLOBAL_VAR(max_binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(IO_SIZE, ULONGLONG_MAX), VALID_RANGE(IO_SIZE, ULONGLONG_MAX),
DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), DEFAULT((ULONGLONG_MAX/IO_SIZE)*IO_SIZE),
BLOCK_SIZE(IO_SIZE)); BLOCK_SIZE(IO_SIZE));
static bool fix_max_binlog_size(sys_var *self, THD *thd, enum_var_type type) static bool fix_max_binlog_size(sys_var *self, THD *thd, enum_var_type type)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment