bzr commit into mysql-trunk branch (marc.alff:3627)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/ based on revid:marc.alff@stripped

 3627 Marc Alff	2011-02-09 [merge]
      Local merge

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-08 15:54:12 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-09 15:35:49 +0000
@@ -2024,7 +2024,7 @@ sub read_plugin_defs($)
 
   # Need to check if we will be running mysqld-debug
   if ($opt_debug_server) {
-    $running_debug= 1 if find_mysqld($basedir) =~ /-debug$/;
+    $running_debug= 1 if find_mysqld($basedir) =~ /mysqld-debug/;
   }
 
   while (<PLUGDEF>) {

No bundle (reason: revision is a merge).