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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
711d7452
Commit
711d7452
authored
Dec 21, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix threadpool related test failures
parent
96041f8e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
14 deletions
+10
-14
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqld--help-win.result
+2
-6
mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
...est/suite/sys_vars/r/thread_pool_max_threads_basic.result
+3
-3
mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
...test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
+1
-1
mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
...-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
+1
-1
mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
+1
-1
mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
...-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
+1
-1
sql/sys_vars.cc
sql/sys_vars.cc
+1
-1
No files found.
mysql-test/r/mysqld--help-win.result
View file @
711d7452
...
@@ -817,9 +817,6 @@ The following options may be given as the first argument:
...
@@ -817,9 +817,6 @@ The following options may be given as the first argument:
(Defaults to on; use --skip-thread-alarm to disable.)
(Defaults to on; use --skip-thread-alarm to disable.)
--thread-cache-size=#
--thread-cache-size=#
How many threads we should keep in a cache for reuse
How many threads we should keep in a cache for reuse
--thread-handling=name
Define threads usage for handling queries, one of
one-thread-per-connection, no-threads
--thread-stack=# The stack size for each thread
--thread-stack=# The stack size for each thread
--time-format=name The TIME format (ignored)
--time-format=name The TIME format (ignored)
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
--timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are
...
@@ -959,7 +956,7 @@ lower-case-table-names 1
...
@@ -959,7 +956,7 @@ lower-case-table-names 1
master-info-file master.info
master-info-file master.info
master-retry-count 86400
master-retry-count 86400
master-verify-checksum FALSE
master-verify-checksum FALSE
max-allowed-packet
1048576
max-allowed-packet
8388608
max-binlog-cache-size 18446744073709547520
max-binlog-cache-size 18446744073709547520
max-binlog-dump-events 0
max-binlog-dump-events 0
max-binlog-size 1073741824
max-binlog-size 1073741824
...
@@ -971,7 +968,7 @@ max-error-count 64
...
@@ -971,7 +968,7 @@ max-error-count 64
max-heap-table-size 16777216
max-heap-table-size 16777216
max-join-size 18446744073709551615
max-join-size 18446744073709551615
max-length-for-sort-data 1024
max-length-for-sort-data 1024
max-long-data-size
1048576
max-long-data-size
8388608
max-prepared-stmt-count 16382
max-prepared-stmt-count 16382
max-relay-log-size 0
max-relay-log-size 0
max-seeks-for-key 18446744073709551615
max-seeks-for-key 18446744073709551615
...
@@ -1093,7 +1090,6 @@ table-open-cache 400
...
@@ -1093,7 +1090,6 @@ table-open-cache 400
tc-heuristic-recover COMMIT
tc-heuristic-recover COMMIT
thread-alarm TRUE
thread-alarm TRUE
thread-cache-size 0
thread-cache-size 0
thread-handling one-thread-per-connection
thread-stack 294912
thread-stack 294912
time-format %H:%i:%s
time-format %H:%i:%s
timed-mutexes FALSE
timed-mutexes FALSE
...
...
mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
View file @
711d7452
...
@@ -20,10 +20,10 @@ set global thread_pool_max_threads=1;
...
@@ -20,10 +20,10 @@ set global thread_pool_max_threads=1;
select @@global.thread_pool_max_threads;
select @@global.thread_pool_max_threads;
@@global.thread_pool_max_threads
@@global.thread_pool_max_threads
1
1
set global thread_pool_max_threads=
4294967295
;
set global thread_pool_max_threads=
65536
;
select @@global.thread_pool_max_threads;
select @@global.thread_pool_max_threads;
@@global.thread_pool_max_threads
@@global.thread_pool_max_threads
4294967295
65536
set session thread_pool_max_threads=1;
set session thread_pool_max_threads=1;
ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should be set with SET GLOBAL
ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should be set with SET GLOBAL
set global thread_pool_max_threads=1.1;
set global thread_pool_max_threads=1.1;
...
@@ -43,5 +43,5 @@ Warnings:
...
@@ -43,5 +43,5 @@ Warnings:
Warning 1292 Truncated incorrect thread_pool_max_threads value: '10000000000'
Warning 1292 Truncated incorrect thread_pool_max_threads value: '10000000000'
select @@global.thread_pool_max_threads;
select @@global.thread_pool_max_threads;
@@global.thread_pool_max_threads
@@global.thread_pool_max_threads
4294967295
65536
SET @@global.thread_pool_max_threads = @start_global_value;
SET @@global.thread_pool_max_threads = @start_global_value;
mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
View file @
711d7452
# uint global
# uint global
--
source
include
/
not_windows
.
inc
SET
@
start_global_value
=
@@
global
.
thread_pool_idle_timeout
;
SET
@
start_global_value
=
@@
global
.
thread_pool_idle_timeout
;
#
#
...
...
mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
View file @
711d7452
...
@@ -18,7 +18,7 @@ select * from information_schema.session_variables where variable_name='thread_p
...
@@ -18,7 +18,7 @@ select * from information_schema.session_variables where variable_name='thread_p
#
#
set
global
thread_pool_max_threads
=
1
;
set
global
thread_pool_max_threads
=
1
;
select
@@
global
.
thread_pool_max_threads
;
select
@@
global
.
thread_pool_max_threads
;
set
global
thread_pool_max_threads
=
4294967295
;
set
global
thread_pool_max_threads
=
65536
;
select
@@
global
.
thread_pool_max_threads
;
select
@@
global
.
thread_pool_max_threads
;
--
error
ER_GLOBAL_VARIABLE
--
error
ER_GLOBAL_VARIABLE
set
session
thread_pool_max_threads
=
1
;
set
session
thread_pool_max_threads
=
1
;
...
...
mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
View file @
711d7452
# uint global
# uint global
--
source
include
/
not_windows
.
inc
SET
@
start_global_value
=
@@
global
.
thread_pool_size
;
SET
@
start_global_value
=
@@
global
.
thread_pool_size
;
#
#
...
...
mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
View file @
711d7452
# uint global
# uint global
--
source
include
/
not_windows
.
inc
SET
@
start_global_value
=
@@
global
.
thread_pool_stall_limit
;
SET
@
start_global_value
=
@@
global
.
thread_pool_stall_limit
;
#
#
...
...
sql/sys_vars.cc
View file @
711d7452
...
@@ -2247,7 +2247,7 @@ static Sys_var_uint Sys_threadpool_max_threads(
...
@@ -2247,7 +2247,7 @@ static Sys_var_uint Sys_threadpool_max_threads(
"thread_pool_max_threads"
,
"thread_pool_max_threads"
,
"Maximum allowed number of worker threads in the thread pool"
,
"Maximum allowed number of worker threads in the thread pool"
,
GLOBAL_VAR
(
threadpool_max_threads
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
threadpool_max_threads
),
CMD_LINE
(
REQUIRED_ARG
),
VALID_RANGE
(
1
,
UINT_MAX
),
DEFAULT
(
500
),
BLOCK_SIZE
(
1
),
VALID_RANGE
(
1
,
65536
),
DEFAULT
(
500
),
BLOCK_SIZE
(
1
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
ON_UPDATE
(
fix_tp_max_threads
)
ON_UPDATE
(
fix_tp_max_threads
)
);
);
...
...
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