From: Kent Boortz
Date: April 23 2012 11:04am
Subject: bzr push into mysql-5.5 branch (kent.boortz:3805)
List-Archive: http://lists.mysql.com/commits/143617
Message-Id: <20120423110421.22478.qmail@helheim>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3805 Kent Boortz	2012-04-23 [merge]
      Merge

    modified:
      storage/innobase/srv/srv0start.c
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-02-16 09:48:16 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-04-23 10:52:14 +0000
@@ -1442,7 +1442,7 @@ sub command_line_setup {
 
   # We make the path absolute, as the server will do a chdir() before usage
   unless ( $opt_vardir =~ m,^/, or
-           (IS_WINDOWS and $opt_vardir =~ m,^[a-z]:/,i) )
+           (IS_WINDOWS and $opt_vardir =~ m,^[a-z]:[/\\],i) )
   {
     # Make absolute path, relative test dir
     $opt_vardir= "$glob_mysql_test_dir/$opt_vardir";

No bundle (reason: useless for push emails).