Commit af66d20c authored by unknown's avatar unknown
Browse files

Merge


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
parents 7b61256f d8bb3089
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ our $opt_big_test= 0; # Send --big-test to mysqltest

our @opt_extra_mysqld_opt;

our $opt_comment;
our $opt_compress;
our $opt_ssl;
our $opt_skip_ssl;
@@ -699,14 +698,6 @@ sub command_line_setup () {
    print '#' x 78, "\n\n";
  }

  if ( $opt_comment )
  {
    print "\n";
    print '#' x 78, "\n";
    print "# $opt_comment\n";
    print '#' x 78, "\n\n";
  }

  foreach my $arg ( @ARGV )
  {
    if ( $arg =~ /^--skip-/ )