Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
21332303
Commit
21332303
authored
Jun 01, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid ulong sysvars, prefer uint or ulonglong
ulong is not portable - different width on different architectures
parent
78c10cca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+1
-1
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
...l-test/suite/sys_vars/r/sysvars_server_notembedded.result
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/mysqld.h
sql/mysqld.h
+1
-1
sql/sys_vars.cc
sql/sys_vars.cc
+1
-1
No files found.
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View file @
21332303
...
...
@@ -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
...
...
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file @
21332303
...
...
@@ -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
...
...
sql/mysqld.cc
View file @
21332303
...
...
@@ -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
;
u
long
max_digest_length
=
0
;
u
int
max_digest_length
=
0
;
ulong
slave_retried_transactions
;
ulonglong
slave_skipped_errors
;
ulong
feature_files_opened_with_delayed_keys
;
...
...
sql/mysqld.h
View file @
21332303
...
...
@@ -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
u
long
max_digest_length
;
extern
u
int
max_digest_length
;
extern
ulong
max_connect_errors
,
connect_timeout
;
extern
my_bool
slave_allow_batching
;
extern
my_bool
allow_slave_start
;
...
...
sql/sys_vars.cc
View file @
21332303
...
...
@@ -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
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment