Commit 4f192a1e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents fc2e96ee d0d69b76
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -671,6 +671,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\"");