bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2806) Bug#43005

[Bjorn Munch]

#At file:///home/bm136801/my/initconn-51/ based on revid:bjorn.munch@stripped

 2806 Bjorn Munch	2009-07-15
      Bug #43005 main.init_connect fais on Windows in PB2
      Server args containing spaces do not work on Windows
      Fixed my_safe_rprocess-win to re-apply "" around such args

    modified:
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/disabled.def
=== modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-05-14 19:56:53 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-07-15 12:20:56 +0000
@@ -188,7 +188,14 @@ int main(int argc, const char** argv )
         die("No real args -> nothing to do");
       /* Copy the remaining args to child_arg */
       for (int j= i+1; j < argc; j++) {
-        to+= _snprintf(to, child_args + sizeof(child_args) - to, "%s ", argv[j]);
+	if (strchr (argv[j], ' ')) {
+	  /* Protect with "" if this arg contains a space */
+	  to+= _snprintf(to, child_args + sizeof(child_args) - to,
+                         "\"%s\" ", argv[j]);
+	} else {
+	  to+= _snprintf(to, child_args + sizeof(child_args) - to,
+	                 "%s ", argv[j]);
+	}
       }
       break;
     } else {

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-05-18 16:53:06 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-07-15 12:20:56 +0000
@@ -11,4 +11,3 @@
 ##############################################################################
 
 rpl_cross_version      : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx
-rpl_init_slave         : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-05-18 16:53:06 +0000
+++ b/mysql-test/t/disabled.def	2009-07-15 12:20:56 +0000
@@ -12,4 +12,3 @@
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 innodb_bug39438          : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-init_connect             : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows


Attachment: [text/bzr-bundle] bzr/[e-mail]