From 34c086526ce0b1a694c445eadcc99d88441ae0b5 Mon Sep 17 00:00:00 2001
From: unknown <igreenhoe@mysql.com>
Date: Mon, 17 Apr 2006 19:43:19 -0700
Subject: [PATCH 1/2] Fix for bug #18979, bad RE in mysql-test-run.pl

mysql-test/lib/mtr_cases.pl:
  Fixed the RE so that backtracking will not occur.
---
 mysql-test/lib/mtr_cases.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index d8f3e61bd11..ed0395abd9d 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/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;
         }

From 2664605c04ad7ccc5fc2977026cbd62f9d86f0cc Mon Sep 17 00:00:00 2001
From: unknown <igreenhoe@mysql.com>
Date: Mon, 17 Apr 2006 19:57:50 -0700
Subject: [PATCH 2/2] Fix for bug #17353.

scripts/mysqld_safe.sh:
  Moved core file changing command outside of root-user only conditional
---
 scripts/mysqld_safe.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index a584c384712..02a961dc3ec 100644
--- a/scripts/mysqld_safe.sh
+++ b/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
-    ulimit -c $core_file_size
-  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
 
 #