-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
30 changed files
with
358 additions
and
408 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# | ||
# MDEV-33150 double-locking of LOCK_thd_kill in performance_schema.session_status | ||
# | ||
set @old_innodb_io_capacity=@@global.innodb_io_capacity; | ||
set @old_innodb_io_capacity_max=@@global.innodb_io_capacity_max; | ||
select * from performance_schema.session_status limit 0; | ||
VARIABLE_NAME VARIABLE_VALUE | ||
set max_session_mem_used=32768; | ||
select * from performance_schema.session_status; | ||
ERROR HY000: The MariaDB server is running with the --max-session-mem-used=32768 option so it cannot execute this statement | ||
set global innodb_io_capacity_max=100; | ||
Warnings: | ||
Warning 1210 Setting innodb_io_capacity_max 100 lower than innodb_io_capacity 200. | ||
Warning 1210 Setting innodb_io_capacity to 100 | ||
set max_session_mem_used=default; | ||
set global innodb_io_capacity=@old_innodb_io_capacity; | ||
Warnings: | ||
Warning 1210 Setting innodb_io_capacity to 200 higher than innodb_io_capacity_max 100 | ||
Warning 1210 Setting innodb_max_io_capacity to 400 | ||
set global innodb_io_capacity_max=@old_innodb_io_capacity_max; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--source include/not_embedded.inc | ||
--source include/have_perfschema.inc | ||
--echo # | ||
--echo # MDEV-33150 double-locking of LOCK_thd_kill in performance_schema.session_status | ||
--echo # | ||
source include/have_innodb.inc; | ||
set @old_innodb_io_capacity=@@global.innodb_io_capacity; | ||
set @old_innodb_io_capacity_max=@@global.innodb_io_capacity_max; | ||
select * from performance_schema.session_status limit 0; # discover the table | ||
set max_session_mem_used=32768; | ||
--error ER_OPTION_PREVENTS_STATEMENT | ||
# this used to crash, when OOM happened under LOCK_thd_kill | ||
select * from performance_schema.session_status; | ||
# this used to cause mutex lock order violation when OOM happened under LOCK_global_system_variables | ||
set global innodb_io_capacity_max=100; | ||
set max_session_mem_used=default; | ||
set global innodb_io_capacity=@old_innodb_io_capacity; | ||
set global innodb_io_capacity_max=@old_innodb_io_capacity_max; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.