From 1f92b717b12d7fe9c12e5ebda9c625266722507a Mon Sep 17 00:00:00 2001
From: unknown <tomas@whalegate.ndb.mysql.com>
Date: Tue, 18 Dec 2007 11:54:19 +0100
Subject: search for clone several step in the path name

---
 mysql-test/mysql-test-run.pl | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 18633d095b0..6d133c4c435 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -409,13 +409,20 @@ sub main () {
     {
       # use default and add any extra_suites as defined
       $opt_suites= $opt_suites_default;
-      my $ddd= basename(dirname($glob_mysql_test_dir));
-      foreach my $extra_suite (@extra_suites)
+      my $ccc= dirname($glob_mysql_test_dir);
+      my $found= 0;
+      while (!$found and !($ccc eq "/") and !($ccc eq ""))
       {
-	if ($extra_suite->[0] eq "$ddd")
+	my $ddd= basename($ccc);
+	foreach my $extra_suite (@extra_suites)
 	{
-	  $opt_suites= "$extra_suite->[1],$opt_suites";
+	  if ($extra_suite->[0] eq "$ddd")
+	  {
+	    $opt_suites= "$extra_suite->[1],$opt_suites";
+	    $found= 1;
+	  }
 	}
+	$ccc= dirname($ccc);
       }
     }
 
-- 
cgit v1.2.1


From 6cb9dfed6fb711b550c91f66609f4a34fa74cf78 Mon Sep 17 00:00:00 2001
From: unknown <mkindahl@dl145h.mysql.com>
Date: Wed, 6 Feb 2008 06:18:06 +0100
Subject: Removing duplicate code from mysql-test-run.pl

mysql-test/mysql-test-run.pl:
  Removing duplicate code.
---
 mysql-test/mysql-test-run.pl | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 536cb873b9a..89b4073ca87 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3870,14 +3870,6 @@ sub mysqld_arguments ($$$$) {
     mtr_add_arg($args, "%s--user=root");
   }
 
-  # When mysqld is run by a root user(euid is 0), it will fail
-  # to start unless we specify what user to run as, 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", $prefix);
-  }
-
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
-- 
cgit v1.2.1


From 2c9578375d7d17aee2ea45ef10fd27ff99d26c64 Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.bredbandsbolaget.se>
Date: Wed, 13 Feb 2008 20:52:01 +0100
Subject: correction of merge

---
 mysql-test/mysql-test-run.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 7f4312130c2..eeef9b22506 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -136,9 +136,12 @@ our $opt_suites;
 our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
 our @extra_suites=
 (
- ["mysql-5.1-new-ndb",   "ndb_team"],
- ["mysql-5.1-telco-6.2", "ndb_team"],
- ["mysql-5.1-telco-6.3", "ndb_team"],
+ ["mysql-5.1-new-ndb",         "ndb_team"],
+ ["mysql-5.1-new-ndb-merge",   "ndb_team"],
+ ["mysql-5.1-telco-6.2",       "ndb_team"],
+ ["mysql-5.1-telco-6.2-merge", "ndb_team"],
+ ["mysql-5.1-telco-6.3",       "ndb_team"],
+ ["mysql-6.0-ndb",             "ndb_team"],
 );
 
 
-- 
cgit v1.2.1