Skip to content

Commit a4bccef

Browse files
committed
MDEV-20372 - fix thread_pool_info
In rare cases, both listener and worker can do poll at the same time (one of them will return events, another one no events) Fix test query to account for it.
1 parent 2655984 commit a4bccef

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

mysql-test/main/thread_pool_info.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ FLUSH THREAD_POOL_STATS;
5656
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
5757
SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER)
5858
1
59-
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
60-
SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER)
61-
2
59+
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
60+
SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3
61+
1
6262
DESC INFORMATION_SCHEMA.THREAD_POOL_WAITS;
6363
Field Type Null Key Default Extra
6464
REASON varchar(16) NO

mysql-test/main/thread_pool_info.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) > 0 FROM INFORMATION_SCHEMA.THREAD
2929
--disable_ps_protocol
3030
FLUSH THREAD_POOL_STATS;
3131
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
32-
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
32+
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
3333
--enable_ps_protocol
3434

3535
#I_S.THREAD_POOL_WAITS

mysql-test/unstable-tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ main.status : MDEV-13255 - Wrong result
173173
main.subselect : MDEV-20551 - Valgrind failure
174174
main.subselect_innodb : MDEV-10614 - Wrong result
175175
main.tc_heuristic_recover : MDEV-14189 - Wrong result
176-
main.thread_pool_info : MDEV-20372 - thread_pool_info fails randomly in 10.5
177176
main.timezone2 : Modified in 10.4.12
178177
main.tls_version : MDEV-21965 - old TLS versions don't work on latest Debian and Ubuntu releases
179178
main.tls_version1 : MDEV-21965 - old TLS versions don't work on latest Debian and Ubuntu releases

0 commit comments

Comments
 (0)