database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
unknown
2005-08-27 02:05:35 +02:00
parent 73feede9aa c7e56146d4
commit f0aeadcd3c
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/lib/mtr_timer.pl
View File

@ -119,21 +119,9 @@ sub mtr_timer_stop_all ($) {
foreach my $name ( keys %{$timers->{'timers'}} ) foreach my $name ( keys %{$timers->{'timers'}} )
{ {
my $tpid= $timers->{'timers'}->{$name}->{'pid'}; mtr_timer_stop($timers, $name);
# 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;
} }
return 1;
} }

6
sql/unireg.h
View File

@ -50,7 +50,11 @@
#define MAX_SYS_VAR_LENGTH 32 #define MAX_SYS_VAR_LENGTH 32
#define MAX_KEY 64 /* Max used keys */ #define MAX_KEY 64 /* Max used keys */
#define MAX_REF_PARTS 16 /* Max parts used as ref */ #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 #if SIZEOF_OFF_T > 4
#define MAX_REFLENGTH 8 /* Max length for record ref */ #define MAX_REFLENGTH 8 /* Max length for record ref */
#else #else