mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Merge trift2.mysql.com:/M41/bug20303-4.1
into trift2.mysql.com:/M41/mysql-4.1 mysql-test/mysql-test-run.pl: Auto merged
This commit is contained in:
commit
a6042ffbe9
1 changed files with 13 additions and 0 deletions
|
@ -611,6 +611,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\"");
|
||||
|
@ -2461,6 +2467,13 @@ sub valgrind_arguments {
|
|||
##############################################################################
|
||||
|
||||
sub usage ($) {
|
||||
my $message= shift;
|
||||
|
||||
if ( $message )
|
||||
{
|
||||
print STDERR "$message \n";
|
||||
}
|
||||
|
||||
print STDERR <<HERE;
|
||||
|
||||
mysql-test-run [ OPTIONS ] [ TESTCASE ]
|
||||
|
|
Loading…
Reference in a new issue