Commit 0e0755ea authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1--main

into  mysql.com:/home/mydev/mysql-5.1-amerge

parents cd53e516 2da24bb6
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -694,6 +694,12 @@ sub command_line_setup () {
    {
      push(@opt_extra_mysqld_opt, $arg);
    }
    elsif ( $arg =~ /^--$/ )
    {
      # It is an effect of setting 'pass_through' in option processing
      # that the lone '--' separating options from arguments survives,
      # simply ignore it.
    }
    elsif ( $arg =~ /^-/ )
    {
      usage("Invalid option \"$arg\"");
@@ -3713,6 +3719,13 @@ sub valgrind_arguments {
##############################################################################

sub usage ($) {
  my $message= shift;

  if ( $message )
  {
    print STDERR "$message \n";
  }

  print STDERR <<HERE;

mysql-test-run [ OPTIONS ] [ TESTCASE ]