bzr commit into mysql-5.1-bugteam branch (davi:3147)

[Davi Arnaut]

# At a local mysql-5.1-bugteam repository of davi

 3147 Davi Arnaut	2009-09-29
      Don't use the semicolon character as a argument separator as it
      can be interpreted as a shell metacharacter in some circumstances.
      For example, it is interpreted as a command separator when invoking
      a debugger.
     @ mysql-test/lib/mtr_cases.pm
        Use ':' as the separator on non-Windows platforms.
     @ mysql-test/mysql-test-run.pl
        Remove unnecessary use of the separator.

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-09-23 12:12:12 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-09-29 14:11:46 +0000
@@ -493,6 +493,7 @@ sub collect_one_suite($)
       $lib_innodb_plugin)
   {
     my @new_cases;
+    my $sep= (IS_WINDOWS) ? ';' : ':';
 
     foreach my $test (@cases)
     {
@@ -520,12 +521,13 @@ sub collect_one_suite($)
         }
       }
       my $plugin_filename= basename($lib_innodb_plugin);
+      my $plugin_list= "innodb=$plugin_filename" . $sep . "innodb_locks=$plugin_filename";
       push(@{$new_test->{master_opt}}, '--ignore-builtin-innodb');
       push(@{$new_test->{master_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
-      push(@{$new_test->{master_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename");
+      push(@{$new_test->{master_opt}}, "--plugin_load=$plugin_list");
       push(@{$new_test->{slave_opt}}, '--ignore-builtin-innodb');
       push(@{$new_test->{slave_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
-      push(@{$new_test->{slave_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename");
+      push(@{$new_test->{slave_opt}}, "--plugin_load=$plugin_list");
       if ($new_test->{combination})
       {
         $new_test->{combination}.= ' + InnoDB plugin';

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-09-02 21:29:11 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-09-29 14:11:46 +0000
@@ -1812,7 +1812,7 @@ sub environment_setup {
       ($lib_example_plugin ? dirname($lib_example_plugin) : "");
 
     $ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'";
-    $ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=;EXAMPLE=".$plugin_filename.";";
+    $ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=EXAMPLE=".$plugin_filename;
   }
 
   # ----------------------------------------------------


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