Commit e5d8d9d2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
parents 801b1afe a522b4a8

mysql-test/lib/mtr_cases.pl

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ sub collect_test_cases ($) { 
      while ( <DISABLED> )

      {

        chomp;

        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )

        if ( /^\s*([^\s:]+)\s*:\s*(.*?)\s*$/ )

        {

          $disabled{$1}= $2;

        }

scripts/mysqld_safe.sh

+7 −4
Original line number Diff line number Diff line
@@ -321,11 +321,14 @@ then 
    ulimit -n $open_files

    args="--open-files-limit=$open_files $args"

  fi

fi



# Try to set the core file size (even if we aren't root) because many systems

# don't specify a hard limit on core file size.

if test -n "$core_file_size"

then

  ulimit -c $core_file_size

fi

fi



#

# If there exists an old pid file, check if the daemon is already running