diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-10 00:20:23 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-10 00:20:23 +0100 |
| commit | b436db98fe123f4b0c83df3532881b038f7d9a9d (patch) | |
| tree | aa048f548d9037bd3eca6df0d415a8dd314e0ac8 /sql/sys_vars.cc | |
| parent | b3093073b1ec076ad7ef5ef8b8fca9022864a890 (diff) | |
| download | mariadb-git-10.2-ssl.tar.gz | |
Fix compilation10.2-ssl
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9628c92624f..1284cbb66cb 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1437,16 +1437,11 @@ static Sys_var_ulong Sys_metadata_locks_hash_instances( VALID_RANGE(1, 1024), DEFAULT(8), BLOCK_SIZE(1)); -/* - "pseudo_thread_id" variable used in the test suite to detect 32/64bit - systems. If you change it to something else then ulong then fix the tests - in mysql-test/include/have_32bit.inc and have_64bit.inc. -*/ -static Sys_var_ulong Sys_pseudo_thread_id( +static Sys_var_ulonglong Sys_pseudo_thread_id( "pseudo_thread_id", "This variable is for internal server use", SESSION_ONLY(pseudo_thread_id), - NO_CMD_LINE, VALID_RANGE(0, ULONG_MAX), DEFAULT(0), + NO_CMD_LINE, VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_has_super)); |