mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug in mtr that caused restart to fail if mysqld died to fast

Browse source
This commit is contained in:
Monty 2021-05-26 22:07:20 +03:00
parent 552bb1af7b
commit 9ec2129f71
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/include/restart_mysqld.inc
View file

@ -8,3 +8,8 @@
--source include/shutdown_mysqld.inc
--source include/start_mysqld.inc
# The following sleep is required to give sleep_until_file_created() time
# to notice that the server was restarted. sleep_until_file_created() would
# fail if the server was restarted or killed at once after restart.
--sleep 0.1

5
mysql-test/include/wait_until_connected_again.inc
View file

@ -33,7 +33,10 @@ while ($mysql_errno)
{
let $mysql_errno=0;
}
--sleep 0.1
if ($mysql_errno > 0)
{
--sleep 0.1
}
}
--enable_query_log
--enable_result_log

6
mysql-test/lib/mtr_process.pl
View file

@ -107,10 +107,10 @@ sub sleep_until_file_created ($$$$) {
my $timeout= shift;
my $proc= shift;
my $warn_seconds = shift;
my $sleeptime= 100; # Milliseconds
my $loops= ($timeout * 1000) / $sleeptime;
my $sleeptime= 10; # Milliseconds
my $loops= ($timeout * 10000) / $sleeptime;
for ( my $loop= 1; $loop <= $loops; $loop++ )
for ( my $loop= 0; $loop <= $loops; $loop++ )
{
if ( -r $pidfile )
{