database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

new valgrind suppression for ld.so

Browse Source 
give mysqld more time to start under valgrind
This commit is contained in:
Sergei Golubchik
2011-12-14 10:59:11 +01:00
parent db8f698c8a
commit 818af42f1d
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/mtr_process.pl
View File

@@ -40,7 +40,7 @@ BEGIN
eval 'sub USE_NETPING { $use_netping }';
}
sub sleep_until_file_created ($$$);
sub sleep_until_file_created ($$$$);
sub mtr_ping_port ($);
sub mtr_ping_port ($) {
@@ -102,10 +102,11 @@ sub mtr_ping_port ($) {
# FIXME check that the pidfile contains the expected pid!
sub sleep_until_file_created ($$$) {
sub sleep_until_file_created ($$$$) {
my $pidfile= shift;
my $timeout= shift;
my $proc= shift;
my $warn_seconds = shift;
my $sleeptime= 100; # Milliseconds
my $loops= ($timeout * 1000) / $sleeptime;
@@ -128,8 +129,8 @@ sub sleep_until_file_created ($$$) {
mtr_debug("Sleep $sleeptime milliseconds waiting for $pidfile");
# Print extra message every 60 seconds
if ( $seconds > 1 && int($seconds * 10) % 600 == 0 && $seconds < $timeout )
# Print extra message every $warn_seconds seconds
if ( $seconds > 1 && $seconds % $warn_seconds == 0 && $seconds < $timeout )
{
my $left= $timeout - $seconds;
mtr_warning("Waited $seconds seconds for $pidfile to be created, " .