mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-18 14:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

avoid ulong sysvars, prefer uint or ulonglong

Browse source 
ulong is not portable - different width on different architectures
This commit is contained in:
Sergei Golubchik 2015-06-01 21:31:31 +02:00
commit 2133230305
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file

@ -1793,7 +1793,7 @@ GLOBAL_VALUE 1024
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum length considered for digest text.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576

2
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file

@ -1947,7 +1947,7 @@ GLOBAL_VALUE 1024
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum length considered for digest text.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576

2
sql/mysqld.cc
View file

@ -520,7 +520,7 @@ ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
ulong binlog_stmt_cache_use= 0, binlog_stmt_cache_disk_use= 0;
ulong max_connections, max_connect_errors;
ulong extra_max_connections;
ulong max_digest_length= 0;
uint max_digest_length= 0;
ulong slave_retried_transactions;
ulonglong slave_skipped_errors;
ulong feature_files_opened_with_delayed_keys;

2
sql/mysqld.h
View file

@ -187,7 +187,7 @@ extern ulong query_cache_limit;
extern ulong query_cache_min_res_unit;
extern ulong slow_launch_threads, slow_launch_time;
extern MYSQL_PLUGIN_IMPORT ulong max_connections;
extern ulong max_digest_length;
extern uint max_digest_length;
extern ulong max_connect_errors, connect_timeout;
extern my_bool slave_allow_batching;
extern my_bool allow_slave_start;

2
sql/sys_vars.cc
View file

@ -1346,7 +1346,7 @@ static Sys_var_ulong Sys_max_connect_errors(
VALID_RANGE(1, UINT_MAX), DEFAULT(MAX_CONNECT_ERRORS),
BLOCK_SIZE(1));
static Sys_var_long Sys_max_digest_length(
static Sys_var_uint Sys_max_digest_length(
"max_digest_length", "Maximum length considered for digest text.",
PARSED_EARLY READ_ONLY GLOBAL_VAR(max_digest_length),
CMD_LINE(REQUIRED_ARG),