Commit 9e9a14ba authored by unknown's avatar unknown

Merge trift2.mysql.com:/M50/bug20303-5.0

into trift2.mysql.com:/M50/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents d9590820 4f0935c4
......@@ -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\"");
......@@ -3428,6 +3434,13 @@ sub valgrind_arguments {
##############################################################################
sub usage ($) {
my $message= shift;
if ( $message )
{
print STDERR "$message \n";
}
print STDERR <<HERE;
mysql-test-run [ OPTIONS ] [ TESTCASE ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment