Commit 1ba7235e authored by unknown's avatar unknown
Browse files

Manual merge. 


mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).
parents eb6b2bdc 7bb18828

mysql-test/mysql-test-run.pl

+9 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ our $opt_udiff; 


our $opt_skip_ndbcluster;

our $opt_with_ndbcluster;

our $opt_with_ndbcluster_only= 0;  # dummy, ignored



our $opt_with_openssl;



our $exe_ndb_mgm;

our $path_ndb_tools_dir;
@@ -572,6 +575,7 @@ sub command_line_setup () { 
             'force'                    => \$opt_force,

             'with-ndbcluster'          => \$opt_with_ndbcluster,

             'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,

             'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,

             'do-test=s'                => \$opt_do_test,

             'suite=s'                  => \$opt_suite,

             'skip-rpl'                 => \$opt_skip_rpl,
@@ -677,6 +681,11 @@ sub command_line_setup () { 
    print '#' x 78, "\n\n";

  }



  if ( $opt_with_ndbcluster_only )

  {

    print "# Option '--with-ndbcluster-only' is ignored in this release.\n";

  }



  foreach my $arg ( @ARGV )

  {

    if ( $arg =~ /^--skip-/ )