bzr push into mysql-5.5 branch (bjorn.munch:3325 to 3326)

[Bjorn Munch]

 3326 Bjorn Munch	2011-02-09
      Silly mistake in 59148, forgot .exe on Windows

    modified:
      mysql-test/mysql-test-run.pl
 3325 Joerg Bruehe	2011-02-09 [merge]
      Empty upmerge.

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-08 15:47:33 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-09 15:25:34 +0000
@@ -2022,7 +2022,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: useless for push emails).