mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
Updated misc_session_status.test to not fail if select does not fail
The test with memory restrictions randomly works or fails in buildbot depending on server configurations. On my machine the original test worked. As the test was there to just check if the server crashes when run with small memory configurations, I disabled testing if the query would fail or not. The test still has its original purpose. Discussed with: Sergei Golubchik <serg@mariadb.org>
This commit is contained in:
parent
e600f9aebb
commit
504cfa4857
2 changed files with 3 additions and 2 deletions
mysql-test/suite/perfschema
|
@ -7,7 +7,6 @@ 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.
|
||||
|
|
|
@ -10,9 +10,11 @@ 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
|
||||
--disable_result_log
|
||||
--error 0,ER_OPTION_PREVENTS_STATEMENT
|
||||
# this used to crash, when OOM happened under LOCK_thd_kill
|
||||
select * from performance_schema.session_status;
|
||||
--enable_result_log
|
||||
# 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;
|
||||
|
|
Loading…
Add table
Reference in a new issue