From a0a4cf336fc0ad09f7e4d159df7e524bc0dd8be3 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Thu, 1 Nov 2007 11:01:05 +0100
Subject: [PATCH 1/3] Fix comment

---
 client/mysqltest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index eae3b05f61a..e5ae9e80a88 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2675,7 +2675,7 @@ void do_copy_file(struct st_command *command)
   command	command handle
 
   DESCRIPTION
-  chmod_file <octal> <file_name>
+  chmod <octal> <file_name>
   Change file permission of <file_name>
 
 */

From 8eb11f8405170135efd9466e71850d2b2c0ae7ec Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Thu, 1 Nov 2007 11:02:28 +0100
Subject: [PATCH 2/3] Bug#27753 enable mysql-test-run.pl to ignore tests based
 on wildcard  - Fix problem in first implementation

mysql-test/lib/mtr_cases.pl:
  Prepend a ^ to the regex only if _all_ charactersin the pattern are normal
---
 mysql-test/lib/mtr_cases.pl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 5aabb7f8863..b9943fb6cfa 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -32,16 +32,14 @@ my $skip_test;
 
 sub init_pattern {
   my ($from, $what)= @_;
-  if ( $from =~ /[a-z0-9]/ ) {
+  if ( $from =~ /^[a-z0-9]$/ ) {
     # Does not contain any regex, make the pattern match
     # beginning of string
     $from= "^$from";
   }
-  else {
-    # Check that pattern is a valid regex
-    eval { "" =~/$from/; 1 } or
-      mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
-  }
+  # Check that pattern is a valid regex
+  eval { "" =~/$from/; 1 } or
+    mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
   return $from;
 }
 

From 775f84186a4b026132ec08eb43ac15aec2b1aa63 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Thu, 1 Nov 2007 19:40:27 +0100
Subject: [PATCH 3/3] Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41
 & 5.0.45 on Mac OS X Server 10.5

mysql-test/mysql-test-run.pl:
  Also check for euid == 0
---
 mysql-test/mysql-test-run.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b81d2eb0019..b123c377ce7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3727,6 +3727,16 @@ sub mysqld_arguments ($$$$) {
   # see BUG#28359
   mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
 
+
+  # When mysqld is run by a root user(euid is 0), it will fail
+  # to start unless we specify what user to run as. If not running
+  # as root it will be ignored, see BUG#30630
+  my $euid= $>;
+  if (!$glob_win32 and $euid == 0 and
+      grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
+    mtr_add_arg($args, "%s--user=root");
+  }
+
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);