Skip to content
/ server Public
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mysql-test/main/tmp_space_usage.test
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,14 @@ let $tmp_usage1=`select variable_value from information_schema.session_status wh
connection c1;
--disable_query_log
let $tmp_usage2=`select tmp_space_used from information_schema.processlist where id=$id`;
if ($tmp_usage1 == $tmp_usage2)
# The two values are read at slightly different times, so they may differ
# by a small amount due to internal temp space changes between reads.
let $diff=`select abs(cast('$tmp_usage1' as signed) - cast('$tmp_usage2' as signed))`;
if ($diff <= 32768)
{
--echo # information_schema.process_list.tmp_space_used == status.tmp_space_used
}
if ($tmp_usage1 != $tmp_usage2)
if ($diff > 32768)
{
--echo tmp_space_used difference: $tmp_usage1 != $tmp_usage2
}
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/suite/events/events_restart.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
call mtr.add_suppression('Column count of mysql.event is wrong. Expected .*, found .*\. The table is probably corrupted');
call mtr.add_suppression('Event Scheduler: An error occurred when initializing system tables. Disabling the Event Scheduler');
call mtr.add_suppression('Event Scheduler.*shutdown.*');
call mtr.add_suppression('Event Scheduler: error during compilation of');
call mtr.add_suppression('Event Scheduler:.*Query was empty');
--enable_query_log

let $collation_server=`select @@collation_server`;
Expand Down