mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
47c6b6a6cf
Before this fix, the server did not recognize 'short' (as in -a) options but only 'long' (as in --ansi) options in the startup command line, due to earlier changes in 5.5 introduced for the performance schema. The root cause is that handle_options() did not honor the my_getopt_skip_unknown flag when parsing 'short' options. The fix changes handle_options(), so that my_getopt_skip_unknown is honored in all cases. Note that there are limitations to this, see the added doxygen documentation in handle_options(). The current usage of handle_options() by the server to parse early performance schema options fits within the limitations. This has been enforced by an assert for PARSE_EARLY options, for safety.
49 lines
1.6 KiB
Text
49 lines
1.6 KiB
Text
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
|
# Tests for PERFORMANCE_SCHEMA
|
|
# Check error handling for invalid server start options
|
|
|
|
--source include/not_embedded.inc
|
|
--source include/have_perfschema.inc
|
|
|
|
let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_4.txt;
|
|
--error 0,1
|
|
--remove_file $outfile
|
|
--error 1
|
|
--exec $MYSQLD_BOOTSTRAP_CMD --loose-console -a -h bad_option_h_param > $outfile 2>&1
|
|
|
|
perl;
|
|
use strict;
|
|
use warnings;
|
|
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_4.txt";
|
|
open(FILE, "<", $fname) or die;
|
|
my @lines= <FILE>;
|
|
# those must be in the file for the test to pass
|
|
my @patterns=
|
|
("Can't change dir to.*bad_option_h_param",
|
|
"Aborting");
|
|
foreach my $one_line (@lines)
|
|
{
|
|
foreach my $one_pattern (@patterns)
|
|
{
|
|
# print pattern, not line, to get a stable output
|
|
print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/);
|
|
}
|
|
}
|
|
close FILE;
|
|
EOF
|
|
--remove_file $outfile
|
|
|