mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1
mysql-test/mysql-test-run.pl: Auto merged
This commit is contained in:
commit
741edd2e80
1 changed files with 13 additions and 0 deletions
|
@ -694,6 +694,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\"");
|
||||||
|
@ -3712,6 +3718,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 ]
|
||||||
|
|
Loading…
Add table
Reference in a new issue