1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00

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

into trift2.mysql.com:/M50/mysql-5.0
This commit is contained in:
joerg@trift2.mysql.com
2006-06-09 14:13:01 +02:00

View File

@@ -671,6 +671,12 @@ sub command_line_setup () {
{ {
push(@opt_extra_mysqld_opt, $arg); 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 =~ /^-/ ) elsif ( $arg =~ /^-/ )
{ {
usage("Invalid option \"$arg\""); usage("Invalid option \"$arg\"");
@@ -3428,6 +3434,13 @@ sub valgrind_arguments {
############################################################################## ##############################################################################
sub usage ($) { sub usage ($) {
my $message= shift;
if ( $message )
{
print STDERR "$message \n";
}
print STDERR <<HERE; print STDERR <<HERE;
mysql-test-run [ OPTIONS ] [ TESTCASE ] mysql-test-run [ OPTIONS ] [ TESTCASE ]