From 857258f108f7adc9383e4848415348057d8213d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Aug 2005 00:52:52 +0200 Subject: [PATCH 1/3] mtr_timer.pl: Simplified and corrected mtr_timer_stop_all() mysql-test/lib/mtr_timer.pl: Simplified and corrected mtr_timer_stop_all() --- mysql-test/lib/mtr_timer.pl | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl index f0c75d2e13e..e96d044dde1 100644 --- a/mysql-test/lib/mtr_timer.pl +++ b/mysql-test/lib/mtr_timer.pl @@ -119,21 +119,9 @@ sub mtr_timer_stop_all ($) { foreach my $name ( keys %{$timers->{'timers'}} ) { - my $tpid= $timers->{'timers'}->{$name}->{'pid'}; - - # FIXME as Cygwin reuses pids fast, maybe check that is - # the expected process somehow?! - kill(9, $tpid); - - # As the timers are so simple programs, we trust them to terminate, - # and use blocking wait for it. We wait just to avoid a zombie. - waitpid($tpid,0); - - delete $timers->{'timers'}->{$name}; # Remove the timer information - delete $timers->{'pids'}->{$tpid}; # and PID reference - - return 1; + mtr_timer_stop($name); } + return 1; } From 7662fc2a12aa36719df09d10025156dc831efa55 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Aug 2005 01:45:50 +0200 Subject: [PATCH 2/3] --- mysql-test/lib/mtr_timer.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl index e96d044dde1..709cebd6407 100644 --- a/mysql-test/lib/mtr_timer.pl +++ b/mysql-test/lib/mtr_timer.pl @@ -119,7 +119,7 @@ sub mtr_timer_stop_all ($) { foreach my $name ( keys %{$timers->{'timers'}} ) { - mtr_timer_stop($name); + mtr_timer_stop($timers, $name); } return 1; } From c7e56146d4f45e259897c58953502edced463bfb Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Aug 2005 01:50:38 +0200 Subject: [PATCH 3/3] unireg.h: Max index key length increased from 1024 to 3072 for 64 bit builds. sql/unireg.h: Max index key length increased from 1024 to 3072 for 64 bit builds. --- sql/unireg.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sql/unireg.h b/sql/unireg.h index 8d88683241b..6afefa579e8 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -50,7 +50,11 @@ #define MAX_SYS_VAR_LENGTH 32 #define MAX_KEY 64 /* Max used keys */ #define MAX_REF_PARTS 16 /* Max parts used as ref */ -#define MAX_KEY_LENGTH 1024 /* max possible key */ +#if SIZEOF_CHARP > 4 +#define MAX_KEY_LENGTH 3072 /* max possible key, if 64 bits */ +#else +#define MAX_KEY_LENGTH 1024 /* max possible key, if 32 bits */ +#endif #if SIZEOF_OFF_T > 4 #define MAX_REFLENGTH 8 /* Max length for record ref */ #else