Commit f0aeadcd authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents 73feede9 c7e56146

mysql-test/lib/mtr_timer.pl

+2 −14
Original line number Diff line number Diff line
@@ -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($timers, $name);

  }

  return 1;

}

sql/unireg.h

+5 −1
Original line number Diff line number Diff line
@@ -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