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

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint

mysql-test/lib/mtr_cases.pl

@@ -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

@@ -321,10 +321,13 @@ then
     ulimit -n $open_files
     args="--open-files-limit=$open_files $args"
   fi
-  if test -n "$core_file_size"
-  then
+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
 
 #