diff options
29 files changed, 219 insertions, 153 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 4330faa2fa9..dbf999edac8 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -211,7 +211,7 @@ extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); extern void (*fatal_error_handler_hook)(uint my_err, const char *str, myf MyFlags); extern uint my_file_limit; -extern ulong my_thread_stack_size; +extern ulonglong my_thread_stack_size; extern const char *(*proc_info_hook)(MYSQL_THD, const char *, const char *, const char *, const unsigned int); diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result index 657f1f57b2d..45e502ca5a4 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result @@ -36,11 +36,11 @@ SELECT `int_key` FROM CC WHERE `date_nokey` < `datetime_nokey` XOR '2009-11-25' ) ; pk -9 2 +4 5 6 -4 +9 Warnings: Warning 1292 Truncated incorrect INTEGER value: '2009-11-25' Warning 1292 Truncated incorrect INTEGER value: '2009-11-25' diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result index 2a8f239dd39..b227b70133f 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result @@ -38,7 +38,8 @@ select @@global.deadlock_timeout_long; set session deadlock_timeout_long=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect deadlock_timeout_long value: '18446744073709551615' select @@session.deadlock_timeout_long; @@session.deadlock_timeout_long -18446744073709551615 +4294967295 SET @@global.deadlock_timeout_long = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result index a789594a843..5b8449142f2 100644 --- a/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result +++ b/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result @@ -38,7 +38,8 @@ select @@global.deadlock_timeout_short; set session deadlock_timeout_short=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect deadlock_timeout_short value: '18446744073709551615' select @@session.deadlock_timeout_short; @@session.deadlock_timeout_short -18446744073709551615 +4294967295 SET @@global.deadlock_timeout_short = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result index adf2b4c39b9..25706a1a3f4 100644 --- a/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result @@ -35,7 +35,8 @@ select @@global.debug_binlog_fsync_sleep; set global debug_binlog_fsync_sleep=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect debug_binlog_fsync_sleep value: '18446744073709551615' select @@global.debug_binlog_fsync_sleep; @@global.debug_binlog_fsync_sleep -18446744073709551615 +4294967295 SET @@global.debug_binlog_fsync_sleep = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result index af73196d14f..3da10bc8416 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result @@ -40,19 +40,21 @@ SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit 1 SET @@global.delayed_insert_limit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect delayed_insert_limit value: '42949672950' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 SET @@global.delayed_insert_limit = 429496729.5; ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 SET @@global.delayed_insert_limit = ON; ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit' SELECT @@global.delayed_insert_limit; @@global.delayed_insert_limit -42949672950 +4294967295 '#-------------------FN_DYNVARS_024_05----------------------------#' SET @@session.delayed_insert_limit = 0; ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result index 8b1936e68c5..f4448b08b1f 100644 --- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result @@ -40,19 +40,21 @@ SELECT @@global.delayed_queue_size; @@global.delayed_queue_size 1 SET @@global.delayed_queue_size = 42949672950; +Warnings: +Warning 1292 Truncated incorrect delayed_queue_size value: '42949672950' SELECT @@global.delayed_queue_size; @@global.delayed_queue_size -42949672950 +4294967295 SET @@global.delayed_queue_size = 429496729.5; ERROR 42000: Incorrect argument type to variable 'delayed_queue_size' SELECT @@global.delayed_queue_size; @@global.delayed_queue_size -42949672950 +4294967295 SET @@global.delayed_queue_size = ON; ERROR 42000: Incorrect argument type to variable 'delayed_queue_size' SELECT @@delayed_queue_size; @@delayed_queue_size -42949672950 +4294967295 '#-------------------FN_DYNVARS_026_05----------------------------#' SET @@session.delayed_queue_size = 0; ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result index 5e0222e8968..9df9f56bd1f 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result +++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result @@ -45,12 +45,12 @@ Warnings: Warning 1292 Truncated incorrect key_cache_age_threshold value: '42949672951' SELECT @@global.key_cache_age_threshold; @@global.key_cache_age_threshold -42949672900 +4294967200 SET @@global.key_cache_age_threshold = 10000.01; ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold' SELECT @@global.key_cache_age_threshold; @@global.key_cache_age_threshold -42949672900 +4294967200 SET @@global.key_cache_age_threshold = -1024; Warnings: Warning 1292 Truncated incorrect key_cache_age_threshold value: '-1024' diff --git a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result index 8711d914980..30eebdc9f44 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result @@ -40,7 +40,8 @@ select @@global.log_slow_rate_limit; set session log_slow_rate_limit=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect log_slow_rate_limit value: '18446744073709551615' select @@session.log_slow_rate_limit; @@session.log_slow_rate_limit -18446744073709551615 +4294967295 SET @@global.log_slow_rate_limit = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result index 838fdff269b..fee7f8966ca 100644 --- a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result +++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result @@ -70,9 +70,11 @@ SELECT @@session.log_warnings; 65550 '#------------------FN_DYNVARS_067_05-----------------------#' SET @@global.log_warnings = 100000000000; +Warnings: +Warning 1292 Truncated incorrect log_warnings value: '100000000000' SELECT @@global.log_warnings; @@global.log_warnings -100000000000 +4294967295 SET @@global.log_warnings = -1024; Warnings: Warning 1292 Truncated incorrect log_warnings value: '-1024' @@ -90,9 +92,11 @@ SELECT @@global.log_warnings; @@global.log_warnings 0 SET @@session.log_warnings = 100000000000; +Warnings: +Warning 1292 Truncated incorrect log_warnings value: '100000000000' SELECT @@session.log_warnings; @@session.log_warnings -100000000000 +4294967295 SET @@session.log_warnings = -2; Warnings: Warning 1292 Truncated incorrect log_warnings value: '-2' diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result index d760474affd..d3c3cbd7a44 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result @@ -1,7 +1,7 @@ SET @start_value = @@global.max_binlog_cache_size; SELECT @start_value; @start_value -18446744073709547520 +4294963200 '#--------------------FN_DYNVARS_072_01------------------------#' SET @@global.max_binlog_cache_size = 5000; Warnings: @@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_cache_size value: '5000' SET @@global.max_binlog_cache_size = DEFAULT; SELECT @@global.max_binlog_cache_size; @@global.max_binlog_cache_size -18446744073709547520 +4294963200 '#---------------------FN_DYNVARS_072_02-------------------------#' SET @@global.max_binlog_cache_size = @start_value; SELECT @@global.max_binlog_cache_size = 4294967295; @@ -149,4 +149,4 @@ ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list' SET @@global.max_binlog_cache_size = @start_value; SELECT @@global.max_binlog_cache_size; @@global.max_binlog_cache_size -18446744073709547520 +4294963200 diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result index f2229a0090b..12f40ed87b5 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result @@ -1,7 +1,7 @@ SET @start_value = @@global.max_binlog_stmt_cache_size; SELECT @start_value; @start_value -18446744073709547520 +4294963200 '#--------------------FN_DYNVARS_072_01------------------------#' SET @@global.max_binlog_stmt_cache_size = 5000; Warnings: @@ -9,7 +9,7 @@ Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '5000' SET @@global.max_binlog_stmt_cache_size = DEFAULT; SELECT @@global.max_binlog_stmt_cache_size; @@global.max_binlog_stmt_cache_size -18446744073709547520 +4294963200 '#---------------------FN_DYNVARS_072_02-------------------------#' SET @@global.max_binlog_stmt_cache_size = @start_value; SELECT @@global.max_binlog_stmt_cache_size = 4294967295; @@ -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; SELECT @@global.max_binlog_stmt_cache_size; @@global.max_binlog_stmt_cache_size -18446744073709547520 +4294963200 diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result index bbc117b65b6..19f6f12a50b 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result @@ -42,14 +42,16 @@ SELECT @@global.max_connect_errors; @@global.max_connect_errors 1 SET @@global.max_connect_errors = 100000000000; +Warnings: +Warning 1292 Truncated incorrect max_connect_errors value: '100000000000' SELECT @@global.max_connect_errors; @@global.max_connect_errors -100000000000 +4294967295 SET @@global.max_connect_errors = 10000.01; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -100000000000 +4294967295 SET @@global.max_connect_errors = -1024; Warnings: Warning 1292 Truncated incorrect max_connect_errors value: '-1024' @@ -63,19 +65,21 @@ SELECT @@global.max_connect_errors; @@global.max_connect_errors 1 SET @@global.max_connect_errors = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_connect_errors value: '4294967296' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 SET @@global.max_connect_errors = ON; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 SET @@global.max_connect_errors = 'test'; ERROR 42000: Incorrect argument type to variable 'max_connect_errors' SELECT @@global.max_connect_errors; @@global.max_connect_errors -4294967296 +4294967295 '#-------------------FN_DYNVARS_073_05----------------------------#' SET @@session.max_connect_errors = 4096; ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result index ef48f229abc..2973e7e1efd 100644 --- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result @@ -1,31 +1,31 @@ SET @start_global_value = @@global.max_seeks_for_key; SELECT @start_global_value; @start_global_value -18446744073709551615 +4294967295 SET @start_session_value = @@session.max_seeks_for_key; SELECT @start_session_value; @start_session_value -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_083_01-------------------------#' SET @@global.max_seeks_for_key = 100; SET @@global.max_seeks_for_key = DEFAULT; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -18446744073709551615 +4294967295 SET @@session.max_seeks_for_key = 200; SET @@session.max_seeks_for_key = DEFAULT; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_083_02-------------------------#' SET @@global.max_seeks_for_key = DEFAULT; SELECT @@global.max_seeks_for_key = 4294967295; @@global.max_seeks_for_key = 4294967295 -0 +1 SET @@session.max_seeks_for_key = DEFAULT; SELECT @@session.max_seeks_for_key = 4294967295; @@session.max_seeks_for_key = 4294967295 -0 +1 '#--------------------FN_DYNVARS_083_03-------------------------#' SET @@global.max_seeks_for_key = 1; SELECT @@global.max_seeks_for_key; @@ -82,19 +82,21 @@ SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key 1 SET @@global.max_seeks_for_key = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_seeks_for_key value: '4294967296' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@global.max_seeks_for_key = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@global.max_seeks_for_key = test; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -4294967296 +4294967295 SET @@session.max_seeks_for_key = 0; Warnings: Warning 1292 Truncated incorrect max_seeks_for_key value: '0' @@ -110,14 +112,16 @@ SELECT @@session.max_seeks_for_key; SET @@session.max_seeks_for_key = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SET @@session.max_seeks_for_key = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_seeks_for_key value: '4294967296' SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -4294967296 +4294967295 SET @@session.max_seeks_for_key = test; ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key' SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -4294967296 +4294967295 '#------------------FN_DYNVARS_083_06-----------------------#' SELECT @@global.max_seeks_for_key = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -168,8 +172,8 @@ ERROR 42S22: Unknown column 'max_seeks_for_key' in 'field list' SET @@global.max_seeks_for_key = @start_global_value; SELECT @@global.max_seeks_for_key; @@global.max_seeks_for_key -18446744073709551615 +4294967295 SET @@session.max_seeks_for_key = @start_session_value; SELECT @@session.max_seeks_for_key; @@session.max_seeks_for_key -18446744073709551615 +4294967295 diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result index 32953d24b2b..5daf78fcae1 100644 --- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result @@ -76,9 +76,11 @@ SELECT @@global.max_tmp_tables; @@global.max_tmp_tables 1 SET @@global.max_tmp_tables = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -4294967296 +4294967295 SET @@global.max_tmp_tables = -1; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -86,23 +88,27 @@ SELECT @@global.max_tmp_tables; @@global.max_tmp_tables 1 SET @@global.max_tmp_tables = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@global.max_tmp_tables = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@global.max_tmp_tables = test; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@global.max_tmp_tables; @@global.max_tmp_tables -429496729500 +4294967295 SET @@session.max_tmp_tables = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -4294967296 +4294967295 SET @@session.max_tmp_tables = -1; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -110,9 +116,11 @@ SELECT @@session.max_tmp_tables; @@session.max_tmp_tables 1 SET @@session.max_tmp_tables = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -429496729500 +4294967295 SET @@session.max_tmp_tables = -001; Warnings: Warning 1292 Truncated incorrect max_tmp_tables value: '-1' @@ -122,14 +130,16 @@ SELECT @@session.max_tmp_tables; SET @@session.max_tmp_tables = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SET @@session.max_tmp_tables = 10737418241; +Warnings: +Warning 1292 Truncated incorrect max_tmp_tables value: '10737418241' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -10737418241 +4294967295 SET @@session.max_tmp_tables = test; ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' SELECT @@session.max_tmp_tables; @@session.max_tmp_tables -10737418241 +4294967295 '#------------------FN_DYNVARS_086_06-----------------------#' SELECT @@global.max_tmp_tables = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result index af675e40e19..59d92d5cfe8 100644 --- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result +++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result @@ -1,18 +1,18 @@ SET @start_global_value = @@global.max_write_lock_count; SELECT @start_global_value; @start_global_value -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_088_01-------------------------#' SET @@global.max_write_lock_count = 1000; SET @@global.max_write_lock_count = DEFAULT; SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -18446744073709551615 +4294967295 '#--------------------FN_DYNVARS_088_02-------------------------#' SET @@global.max_write_lock_count = DEFAULT; SELECT @@global.max_write_lock_count = 4294967295; @@global.max_write_lock_count = 4294967295 -0 +1 '#--------------------FN_DYNVARS_088_03-------------------------#' SET @@global.max_write_lock_count = 1; SELECT @@global.max_write_lock_count; @@ -42,9 +42,11 @@ SELECT @@global.max_write_lock_count; @@global.max_write_lock_count 1 SET @@global.max_write_lock_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect max_write_lock_count value: '4294967296' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -4294967296 +4294967295 SET @@global.max_write_lock_count = -1; Warnings: Warning 1292 Truncated incorrect max_write_lock_count value: '-1' @@ -52,19 +54,21 @@ SELECT @@global.max_write_lock_count; @@global.max_write_lock_count 1 SET @@global.max_write_lock_count = 429496729500; +Warnings: +Warning 1292 Truncated incorrect max_write_lock_count value: '429496729500' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 SET @@global.max_write_lock_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_write_lock_count' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 SET @@global.max_write_lock_count = test; ERROR 42000: Incorrect argument type to variable 'max_write_lock_count' SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -429496729500 +4294967295 '#------------------FN_DYNVARS_088_05-----------------------#' SELECT @@global.max_write_lock_count = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -101,4 +105,4 @@ ERROR 42S22: Unknown column 'max_write_lock_count' in 'field list' SET @@global.max_write_lock_count = @start_global_value; SELECT @@global.max_write_lock_count; @@global.max_write_lock_count -18446744073709551615 +4294967295 diff --git a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result index 30ccfce0175..b4b1b9ae402 100644 --- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result @@ -88,23 +88,27 @@ SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit 0 SET @@global.min_examined_row_limit = 429496729500; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '429496729500' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@global.min_examined_row_limit = 65530.34; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@global.min_examined_row_limit = test; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@global.min_examined_row_limit; @@global.min_examined_row_limit -429496729500 +4294967295 SET @@session.min_examined_row_limit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '4294967296' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967296 +4294967295 SET @@session.min_examined_row_limit = -1; Warnings: Warning 1292 Truncated incorrect min_examined_row_limit value: '-1' @@ -114,14 +118,16 @@ SELECT @@session.min_examined_row_limit; SET @@session.min_examined_row_limit = 65530.34; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SET @@session.min_examined_row_limit = 4294967295021; +Warnings: +Warning 1292 Truncated incorrect min_examined_row_limit value: '4294967295021' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967295021 +4294967295 SET @@session.min_examined_row_limit = test; ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit' SELECT @@session.min_examined_row_limit; @@session.min_examined_row_limit -4294967295021 +4294967295 '#------------------FN_DYNVARS_089_06-----------------------#' SELECT @@global.min_examined_row_limit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result index 28f0ca5be0f..46eb9d5e1c0 100644 --- a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result +++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result @@ -82,23 +82,27 @@ SELECT @@global.net_retry_count; @@global.net_retry_count 1 SET @@global.net_retry_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '4294967296' SELECT @@global.net_retry_count; @@global.net_retry_count -4294967296 +4294967295 SET @@global.net_retry_count = 429496729500; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '429496729500' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@global.net_retry_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@global.net_retry_count = test; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@global.net_retry_count; @@global.net_retry_count -429496729500 +4294967295 SET @@session.net_retry_count = 0; Warnings: Warning 1292 Truncated incorrect net_retry_count value: '0' @@ -114,18 +118,22 @@ SELECT @@session.net_retry_count; SET @@session.net_retry_count = 65530.34; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SET @@session.net_retry_count = 6555015425; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '6555015425' SELECT @@session.net_retry_count; @@session.net_retry_count -6555015425 +4294967295 SET @@session.net_retry_count = 4294967296; +Warnings: +Warning 1292 Truncated incorrect net_retry_count value: '4294967296' SELECT @@session.net_retry_count; @@session.net_retry_count -4294967296 +4294967295 SET @@session.net_retry_count = test; ERROR 42000: Incorrect argument type to variable 'net_retry_count' SELECT @@session.net_retry_count; @@session.net_retry_count -4294967296 +4294967295 '#------------------FN_DYNVARS_111_06-----------------------#' SELECT @@global.net_retry_count = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result index 8436ee699e2..a50dbca2062 100644 --- a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result +++ b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result @@ -38,7 +38,8 @@ select @@global.progress_report_time; set session progress_report_time=cast(-1 as unsigned int); Warnings: Warning 1105 Cast to unsigned converted negative integer to it's positive complement +Warning 1292 Truncated incorrect progress_report_time value: '18446744073709551615' select @@session.progress_report_time; @@session.progress_report_time -18446744073709551615 +4294967295 SET @@global.progress_report_time = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result index 3125ee4a415..074075dd2f7 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result @@ -38,18 +38,22 @@ SELECT @@global.query_cache_limit; @@global.query_cache_limit 0 SET @@global.query_cache_limit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '4294967296' SELECT @@global.query_cache_limit; @@global.query_cache_limit -4294967296 +4294967295 SET @@global.query_cache_limit = 10240022115; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '10240022115' SELECT @@global.query_cache_limit; @@global.query_cache_limit -10240022115 +4294967295 SET @@global.query_cache_limit = 10000.01; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -10240022115 +4294967295 SET @@global.query_cache_limit = -1024; Warnings: Warning 1292 Truncated incorrect query_cache_limit value: '-1024' @@ -57,25 +61,27 @@ SELECT @@global.query_cache_limit; @@global.query_cache_limit 0 SET @@global.query_cache_limit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect query_cache_limit value: '42949672950' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 SET @@global.query_cache_limit = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 SET @@global.query_cache_limit = 'test'; ERROR 42000: Incorrect argument type to variable 'query_cache_limit' SELECT @@global.query_cache_limit; @@global.query_cache_limit -42949672950 +4294967295 '#-------------------FN_DYNVARS_131_05----------------------------#' SET @@session.query_cache_limit = 0; ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@query_cache_limit; @@query_cache_limit -42949672950 +4294967295 '#----------------------FN_DYNVARS_131_06------------------------#' SELECT @@global.query_cache_limit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result index 8028098c3c5..91166b676d9 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result @@ -46,6 +46,8 @@ SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 512 SET @@global.query_cache_min_res_unit = 4294967296; +Warnings: +Warning 1292 Truncated incorrect query_cache_min_res_unit value: '4294967296' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 4294967296 @@ -65,25 +67,27 @@ SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit 512 SET @@global.query_cache_min_res_unit = 42949672950; +Warnings: +Warning 1292 Truncated incorrect query_cache_min_res_unit value: '42949672950' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 SET @@global.query_cache_min_res_unit = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 SET @@global.query_cache_min_res_unit = 'test'; ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit' SELECT @@global.query_cache_min_res_unit; @@global.query_cache_min_res_unit -42949672952 +4294967296 '#-------------------FN_DYNVARS_132_05----------------------------#' SET @@session.query_cache_min_res_unit = 0; ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL SELECT @@query_cache_min_res_unit; @@query_cache_min_res_unit -42949672952 +4294967296 '#----------------------FN_DYNVARS_132_06------------------------#' SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result index ef91e91ca86..26b32b56e57 100644 --- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result @@ -86,17 +86,17 @@ Warnings: Warning 1292 Truncated incorrect range_alloc_block_size value: '42949672951' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@global.range_alloc_block_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@global.range_alloc_block_size = test; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@global.range_alloc_block_size; @@global.range_alloc_block_size -42949671936 +4294966272 SET @@session.range_alloc_block_size = 0; Warnings: Warning 1292 Truncated incorrect range_alloc_block_size value: '0' @@ -112,14 +112,16 @@ SELECT @@session.range_alloc_block_size; SET @@session.range_alloc_block_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SET @@session.range_alloc_block_size = 4294967296; +Warnings: +Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967296' SELECT @@session.range_alloc_block_size; @@session.range_alloc_block_size -4294967296 +4294966272 SET @@session.range_alloc_block_size = test; ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size' SELECT @@session.range_alloc_block_size; @@session.range_alloc_block_size -4294967296 +4294966272 '#------------------FN_DYNVARS_137_06-----------------------#' SELECT @@global.range_alloc_block_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result index 9bb422905b4..86a760a5386 100644 --- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result +++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result @@ -39,9 +39,11 @@ SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries 4294967295 SET @@global.slave_transaction_retries = 2147483649*2; +Warnings: +Warning 1292 Truncated incorrect slave_transaction_retries value: '4294967298' SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries -4294967298 +4294967295 SET @@global.slave_transaction_retries = 4294967295; SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries @@ -61,9 +63,11 @@ SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries 0 SET @@global.slave_transaction_retries = 2147483649*2147483649; +Warnings: +Warning 1292 Truncated incorrect slave_transaction_retries value: '4611686022722355201' SELECT @@global.slave_transaction_retries; @@global.slave_transaction_retries -4611686022722355201 +4294967295 SET @@global.slave_transaction_retries = 65530.34; ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries' SET @@global.slave_transaction_retries = '100'; diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result index 3c958439231..a7afc334ba1 100644 --- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result @@ -82,7 +82,7 @@ Warnings: Warning 1292 Truncated incorrect transaction_alloc_block_size value: '123456789201' SELECT @@global.transaction_alloc_block_size; @@global.transaction_alloc_block_size -123456788480 +4294966272 SET @@global.transaction_alloc_block_size = ON; ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' SET @@global.transaction_alloc_block_size = OFF; @@ -114,7 +114,7 @@ Warnings: Warning 1292 Truncated incorrect transaction_alloc_block_size value: '12345678901' SELECT @@session.transaction_alloc_block_size; @@session.transaction_alloc_block_size -12345678848 +4294966272 SET @@session.transaction_alloc_block_size = ON; ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' SET @@session.transaction_alloc_block_size = OFF; diff --git a/mysys/my_init.c b/mysys/my_init.c index e366268936b..9e437162633 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -39,7 +39,7 @@ static my_bool win32_init_tcp_ip(); my_bool my_init_done= 0; uint mysys_usage_id= 0; /* Incremented for each my_init() */ -ulong my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024); +ulonglong my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024); static ulong atoi_octal(const char *str) { diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c43f516fc2e..baba6d45acf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -473,11 +473,11 @@ uint slave_net_timeout; ulong slave_exec_mode_options; ulonglong slave_type_conversions_options; ulong thread_cache_size=0; -ulong binlog_cache_size=0; -ulong max_binlog_cache_size=0; -ulong binlog_stmt_cache_size=0; -ulong max_binlog_stmt_cache_size=0; -ulong query_cache_size=0; +ulonglong binlog_cache_size=0; +ulonglong max_binlog_cache_size=0; +ulonglong binlog_stmt_cache_size=0; +ulonglong max_binlog_stmt_cache_size=0; +ulonglong query_cache_size=0; ulong refresh_version; /* Increments on each reload */ query_id_t global_query_id; my_atomic_rwlock_t global_query_id_lock; @@ -2800,7 +2800,7 @@ and this may fail.\n\n"); fprintf(stderr, "thread_count=%u\n", thread_count); fprintf(stderr, "It is possible that mysqld could use up to \n\ key_buffer_size + (read_buffer_size + sort_buffer_size)*max_threads = %lu K\n\ -bytes of memory\n", ((ulong) dflt_key_cache->key_cache_mem_size + +bytes of memory\n", (ulong) (dflt_key_cache->key_cache_mem_size + (global_system_variables.read_buff_size + global_system_variables.sortbuff_size) * (thread_scheduler->max_threads + extra_max_connections) + @@ -4885,8 +4885,8 @@ int mysqld_main(int argc, char **argv) if (stack_size && stack_size < my_thread_stack_size) { if (global_system_variables.log_warnings) - sql_print_warning("Asked for %lu thread stack, but got %ld", - my_thread_stack_size, (long) stack_size); + sql_print_warning("Asked for %llu thread stack, but got %zu", + my_thread_stack_size, stack_size); #if defined(__ia64__) || defined(__ia64) my_thread_stack_size= stack_size*2; #else diff --git a/sql/mysqld.h b/sql/mysqld.h index 658d578a995..81e91aef832 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -151,7 +151,8 @@ extern ulong delayed_insert_limit, delayed_queue_size; extern ulong delayed_insert_threads, delayed_insert_writes; extern ulong delayed_rows_in_use,delayed_insert_errors; extern ulong slave_open_temp_tables; -extern ulong query_cache_size, query_cache_min_res_unit; +extern ulonglong query_cache_size; +extern ulong query_cache_min_res_unit; extern ulong slow_launch_threads, slow_launch_time; extern ulong table_cache_size, table_def_size; extern MYSQL_PLUGIN_IMPORT ulong max_connections; @@ -165,8 +166,8 @@ extern int max_user_connections; extern ulong what_to_log,flush_time; extern ulong max_prepared_stmt_count, prepared_stmt_count; extern ulong open_files_limit; -extern ulong binlog_cache_size, binlog_stmt_cache_size; -extern ulong max_binlog_cache_size, max_binlog_stmt_cache_size; +extern ulonglong binlog_cache_size, binlog_stmt_cache_size; +extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size, max_relay_log_size; extern ulong opt_binlog_rows_event_max_size; extern ulong rpl_recovery_rank, thread_cache_size; diff --git a/sql/sql_class.h b/sql/sql_class.h index f271a6d5cd9..6f49f52331d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -467,11 +467,13 @@ typedef struct system_variables ulonglong join_buff_space_limit; ulonglong log_slow_filter; ulonglong log_slow_verbosity; + ulonglong bulk_insert_buff_size; + ulonglong join_buff_size; + ulonglong sortbuff_size; + ulonglong group_concat_max_len; ha_rows select_limit; ha_rows max_join_size; ulong auto_increment_increment, auto_increment_offset; - ulong bulk_insert_buff_size; - ulong join_buff_size; ulong lock_wait_timeout; ulong join_cache_level; ulong max_allowed_packet; @@ -496,7 +498,6 @@ typedef struct system_variables ulong read_rnd_buff_size; ulong mrr_buff_size; ulong div_precincrement; - ulong sortbuff_size; /* Total size of all buffers used by the subselect_rowid_merge_engine. */ ulong rowid_merge_buff_size; ulong max_sp_recursion_depth; @@ -508,7 +509,6 @@ typedef struct system_variables ulong trans_alloc_block_size; ulong trans_prealloc_size; ulong log_warnings; - ulong group_concat_max_len; /* Flags for slow log filtering */ ulong log_slow_rate_limit; ulong binlog_format; ///< binlog format for this thd (see enum_binlog_format) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d01f1892d58..f9516b5f6aa 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -211,23 +211,23 @@ static Sys_var_charptr Sys_basedir( READ_ONLY GLOBAL_VAR(mysql_home_ptr), CMD_LINE(REQUIRED_ARG, 'b'), IN_FS_CHARSET, DEFAULT(0)); -static Sys_var_ulong Sys_binlog_cache_size( +static Sys_var_ulonglong Sys_binlog_cache_size( "binlog_cache_size", "The size of the transactional cache for " "updates to transactional engines for the binary log. " "If you often use transactions containing many statements, " "you can increase this to get more performance", GLOBAL_VAR(binlog_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); -static Sys_var_ulong Sys_binlog_stmt_cache_size( +static Sys_var_ulonglong Sys_binlog_stmt_cache_size( "binlog_stmt_cache_size", "The size of the statement cache for " "updates to non-transactional engines for the binary log. " "If you often use statements updating a great number of rows, " "you can increase this to get more performance", GLOBAL_VAR(binlog_stmt_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(IO_SIZE, ULONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), DEFAULT(32768), BLOCK_SIZE(IO_SIZE)); static bool check_has_super(sys_var *self, THD *thd, set_var *var) { @@ -353,11 +353,11 @@ static Sys_var_mybool Sys_binlog_direct( CMD_LINE(OPT_ARG), DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_direct_check)); -static Sys_var_ulong Sys_bulk_insert_buff_size( +static Sys_var_ulonglong Sys_bulk_insert_buff_size( "bulk_insert_buffer_size", "Size of tree cache used in bulk " "insert optimisation. Note that this is a limit per thread!", SESSION_VAR(bulk_insert_buff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1)); + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1)); static Sys_var_charptr Sys_character_sets_dir( "character_sets_dir", "Directory where character sets are", @@ -611,7 +611,7 @@ static Sys_var_ulong Sys_delayed_insert_limit( "handler will check if there are any SELECT statements pending. " "If so, it allows these to execute before continuing", GLOBAL_VAR(delayed_insert_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(DELAYED_LIMIT), BLOCK_SIZE(1)); static Sys_var_ulong Sys_delayed_insert_timeout( "delayed_insert_timeout", @@ -627,7 +627,7 @@ static Sys_var_ulong Sys_delayed_queue_size( "DELAYED. If the queue becomes full, any client that does INSERT " "DELAYED will wait until there is room in the queue again", GLOBAL_VAR(delayed_queue_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(DELAYED_QUEUE_SIZE), BLOCK_SIZE(1)); #ifdef HAVE_EVENT_SCHEDULER static const char *event_scheduler_names[]= { "OFF", "ON", "DISABLED", NullS }; @@ -809,11 +809,11 @@ static Sys_var_ulong Sys_interactive_timeout( CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_join_buffer_size( +static Sys_var_ulonglong Sys_join_buffer_size( "join_buffer_size", "The size of the buffer that is used for joins", SESSION_VAR(join_buff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(128, ULONG_MAX), DEFAULT(128*1024), BLOCK_SIZE(128)); + VALID_RANGE(128, ULONGLONG_MAX), DEFAULT(128*1024), BLOCK_SIZE(128)); static Sys_var_keycache Sys_key_buffer_size( "key_buffer_size", "The size of the buffer used for " @@ -851,7 +851,7 @@ static Sys_var_keycache Sys_key_cache_age_threshold( "blocks in key cache", KEYCACHE_VAR(param_age_threshold), CMD_LINE(REQUIRED_ARG, OPT_KEY_CACHE_AGE_THRESHOLD), - VALID_RANGE(100, ULONG_MAX), DEFAULT(300), + VALID_RANGE(100, UINT_MAX), DEFAULT(300), BLOCK_SIZE(100), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(change_keycache_param)); @@ -933,7 +933,7 @@ static Sys_var_ulong Sys_log_warnings( "Value can be between 0 and 11. Higher values mean more verbosity", SESSION_VAR(log_warnings), CMD_LINE(OPT_ARG, 'W'), - VALID_RANGE(0, ULONG_MAX), DEFAULT(1), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1)); static bool update_cached_long_query_time(sys_var *self, THD *thd, enum_var_type type) @@ -1041,20 +1041,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_ulong Sys_max_binlog_cache_size( +static Sys_var_ulonglong 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, ULONG_MAX), - DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), + DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); -static Sys_var_ulong Sys_max_binlog_stmt_cache_size( +static Sys_var_ulonglong 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, ULONG_MAX), - DEFAULT((ULONG_MAX/IO_SIZE)*IO_SIZE), + VALID_RANGE(IO_SIZE, ULONGLONG_MAX), + DEFAULT((UINT_MAX/IO_SIZE)*IO_SIZE), BLOCK_SIZE(IO_SIZE)); static bool fix_max_binlog_size(sys_var *self, THD *thd, enum_var_type type) @@ -1097,7 +1097,7 @@ static Sys_var_ulong Sys_max_connect_errors( "If there is more than this number of interrupted connections from " "a host this host will be blocked from further connections", GLOBAL_VAR(max_connect_errors), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(MAX_CONNECT_ERRORS), + VALID_RANGE(1, UINT_MAX), DEFAULT(MAX_CONNECT_ERRORS), BLOCK_SIZE(1)); static bool check_max_delayed_threads(sys_var *self, THD *thd, set_var *var) @@ -1170,7 +1170,7 @@ static Sys_var_ulong Sys_max_seeks_for_key( "max_seeks_for_key", "Limit assumed max number of seeks when looking up rows based on a key", SESSION_VAR(max_seeks_for_key), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(ULONG_MAX), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(UINT_MAX), BLOCK_SIZE(1)); static Sys_var_ulong Sys_max_length_for_sort_data( "max_length_for_sort_data", @@ -1262,20 +1262,20 @@ static Sys_var_ulong Sys_max_tmp_tables( "max_tmp_tables", "Maximum number of temporary tables a client can keep open at a time", SESSION_VAR(max_tmp_tables), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(32), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(32), BLOCK_SIZE(1)); static Sys_var_ulong Sys_max_write_lock_count( "max_write_lock_count", "After this many write locks, allow some read locks to run in between", GLOBAL_VAR(max_write_lock_count), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(ULONG_MAX), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(UINT_MAX), BLOCK_SIZE(1)); static Sys_var_ulong Sys_min_examined_row_limit( "min_examined_row_limit", "Don't write queries to slow log that examine fewer rows " "than that", SESSION_VAR(min_examined_row_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); #ifdef _WIN32 static Sys_var_mybool Sys_named_pipe( @@ -1348,7 +1348,7 @@ static Sys_var_ulong Sys_net_retry_count( "If a read on a communication port is interrupted, retry this " "many times before giving up", SESSION_VAR(net_retry_count), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(MYSQLD_NET_RETRY_COUNT), + VALID_RANGE(1, UINT_MAX), DEFAULT(MYSQLD_NET_RETRY_COUNT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_retry_count)); @@ -1660,7 +1660,7 @@ static Sys_var_ulong Sys_range_alloc_block_size( "range_alloc_block_size", "Allocation block size for storing ranges during optimization", SESSION_VAR(range_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(RANGE_ALLOC_BLOCK_SIZE, ULONG_MAX), + VALID_RANGE(RANGE_ALLOC_BLOCK_SIZE, UINT_MAX), DEFAULT(RANGE_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024)); static Sys_var_ulong Sys_multi_range_count( @@ -1682,7 +1682,7 @@ static Sys_var_ulong Sys_query_alloc_block_size( "query_alloc_block_size", "Allocation block size for query parsing and execution", SESSION_VAR(query_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_thd_mem_root)); @@ -1690,7 +1690,7 @@ static Sys_var_ulong Sys_query_prealloc_size( "query_prealloc_size", "Persistent buffer for query parsing and execution", SESSION_VAR(query_prealloc_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(QUERY_ALLOC_PREALLOC_SIZE, ULONG_MAX), + VALID_RANGE(QUERY_ALLOC_PREALLOC_SIZE, UINT_MAX), DEFAULT(QUERY_ALLOC_PREALLOC_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_thd_mem_root)); @@ -1746,10 +1746,10 @@ static Sys_var_ulong Sys_thread_concurrency( READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG), VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_thread_stack( +static Sys_var_ulonglong Sys_thread_stack( "thread_stack", "The stack size for each thread", READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(128*1024, ULONG_MAX), DEFAULT(DEFAULT_THREAD_STACK), + VALID_RANGE(128*1024, ULONGLONG_MAX), DEFAULT(DEFAULT_THREAD_STACK), BLOCK_SIZE(1024)); static Sys_var_charptr Sys_tmpdir( @@ -1776,7 +1776,7 @@ static Sys_var_ulong Sys_trans_alloc_block_size( "transaction_alloc_block_size", "Allocation block size for transactions to be stored in binary log", SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_trans_mem_root)); @@ -1784,7 +1784,7 @@ static Sys_var_ulong Sys_trans_prealloc_size( "transaction_prealloc_size", "Persistent buffer for transactions to be stored in binary log", SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, ULONG_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE), + VALID_RANGE(1024, UINT_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_trans_mem_root)); @@ -1822,11 +1822,11 @@ static bool fix_query_cache_size(sys_var *self, THD *thd, enum_var_type type) query_cache_size= new_cache_size; return false; } -static Sys_var_ulong Sys_query_cache_size( +static Sys_var_ulonglong Sys_query_cache_size( "query_cache_size", "The memory allocated to store results from old queries", GLOBAL_VAR(query_cache_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1024), + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_query_cache_size)); @@ -1834,7 +1834,7 @@ static Sys_var_ulong Sys_query_cache_limit( "query_cache_limit", "Don't cache results that are bigger than this", GLOBAL_VAR(query_cache.query_cache_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); static bool fix_qcache_min_res_unit(sys_var *self, THD *thd, enum_var_type type) { @@ -1846,7 +1846,7 @@ static Sys_var_ulong Sys_query_cache_min_res_unit( "query_cache_min_res_unit", "The minimum size for blocks allocated by the query cache", GLOBAL_VAR(query_cache_min_res_unit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE), + VALID_RANGE(0, UINT_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_qcache_min_res_unit)); @@ -1985,11 +1985,11 @@ static Sys_var_ulong Sys_slow_launch_time( GLOBAL_VAR(slow_launch_time), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(2), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_sort_buffer( +static Sys_var_ulonglong Sys_sort_buffer( "sort_buffer_size", "Each thread that needs to do a sort allocates a buffer of this size", SESSION_VAR(sortbuff_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(MIN_SORT_MEMORY, ULONG_MAX), DEFAULT(MAX_SORT_MEMORY), + VALID_RANGE(MIN_SORT_MEMORY, ULONGLONG_MAX), DEFAULT(MAX_SORT_MEMORY), BLOCK_SIZE(1)); export ulonglong expand_sql_mode(ulonglong sql_mode) @@ -2696,11 +2696,11 @@ static Sys_var_ulong Sys_default_week_format( SESSION_VAR(default_week_format), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 7), DEFAULT(0), BLOCK_SIZE(1)); -static Sys_var_ulong Sys_group_concat_max_len( +static Sys_var_ulonglong Sys_group_concat_max_len( "group_concat_max_len", "The maximum length of the result of function GROUP_CONCAT()", SESSION_VAR(group_concat_max_len), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(4, ULONG_MAX), DEFAULT(1024), BLOCK_SIZE(1)); + VALID_RANGE(4, ULONGLONG_MAX), DEFAULT(1024), BLOCK_SIZE(1)); static char *glob_hostname_ptr; static Sys_var_charptr Sys_hostname( @@ -3120,7 +3120,7 @@ static Sys_var_charptr Sys_slave_skip_errors( static Sys_var_ulonglong Sys_relay_log_space_limit( "relay_log_space_limit", "Maximum space to use for all relay logs", READ_ONLY GLOBAL_VAR(relay_log_space_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); static Sys_var_uint Sys_sync_relaylog_period( "sync_relay_log", "Synchronously flush relay log to disk after " @@ -3154,7 +3154,7 @@ static Sys_var_ulong Sys_slave_trans_retries( "thread will retry a transaction in case it failed with a deadlock " "or elapsed lock wait timeout, before giving up and stopping", GLOBAL_VAR(slave_trans_retries), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(10), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(10), BLOCK_SIZE(1)); #endif static bool check_locale(sys_var *self, THD *thd, set_var *var) @@ -3252,13 +3252,13 @@ static Sys_var_ulong Sys_deadlock_timeout_depth_short( "deadlock_timeout_short", "Short timeout for the two-step deadlock detection (in microseconds)", SESSION_VAR(wt_timeout_short), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(10000), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(10000), BLOCK_SIZE(1)); static Sys_var_ulong Sys_deadlock_timeout_depth_long( "deadlock_timeout_long", "Long timeout for the two-step deadlock detection (in microseconds)", SESSION_VAR(wt_timeout_long), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(50000000), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(50000000), BLOCK_SIZE(1)); #ifndef DBUG_OFF static Sys_var_ulong Sys_debug_crc_break( @@ -3317,7 +3317,7 @@ static Sys_var_ulong Sys_log_slow_rate_limit( "Increase it to reduce the size of the slow or the performance impact " "of slow logging", SESSION_VAR(log_slow_rate_limit), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, ULONG_MAX), DEFAULT(1), BLOCK_SIZE(1)); + VALID_RANGE(1, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1)); static const char *log_slow_verbosity_names[]= { "innodb", "query_plan", 0 }; static Sys_var_set Sys_log_slow_verbosity( @@ -3391,7 +3391,7 @@ static Sys_var_ulong Sys_progress_report_time( "Seconds between sending progress reports to the client for " "time-consuming statements. Set to 0 to disable progress reporting.", SESSION_VAR(progress_report_time), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(56), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(56), BLOCK_SIZE(1)); static Sys_var_mybool Sys_thread_alarm( "thread_alarm", @@ -3423,6 +3423,6 @@ static Sys_var_ulong Sys_debug_binlog_fsync_sleep( "Extra sleep (in microseconds) to add to binlog fsync(), for debugging", GLOBAL_VAR(opt_binlog_dbug_fsync_sleep), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); #endif |