bzr push into mysql-trunk branch (kent.boortz:3722)

[Kent Boortz]

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

    modified:
      storage/innobase/srv/srv0start.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-04-05 11:35:31 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-04-23 11:00:29 +0000
@@ -1454,7 +1454,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).