Commit f77684f3 authored by unknown's avatar unknown

Add a way to remove options which mysql-test-run.pl no longer uses.


mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.
parent a4df2210
...@@ -461,6 +461,19 @@ sub main () { ...@@ -461,6 +461,19 @@ sub main () {
# #
############################################################################## ##############################################################################
#
# When an option is no longer used by this program, it must be explicitly
# ignored or else it will be passed through to mysqld. GetOptions will call
# this subroutine once for each such option on the command line. See
# Getopt::Long documentation.
#
sub warn_about_removed_option {
my ($option, $value, $hash_value) = @_;
warn "WARNING: This option is no longer used, and is ignored: --$option\n";
}
sub command_line_setup () { sub command_line_setup () {
# These are defaults for things that are set on the command line # These are defaults for things that are set on the command line
...@@ -498,6 +511,15 @@ sub command_line_setup () { ...@@ -498,6 +511,15 @@ sub command_line_setup () {
# Read the command line # Read the command line
# Note: Keep list, and the order, in sync with usage at end of this file # Note: Keep list, and the order, in sync with usage at end of this file
# Options that are no longer used must still be processed, because all
# unprocessed options are passed directly to mysqld. The user will be
# warned that the option is being ignored.
#
# Put the complete option string here. For example, to remove the --suite
# option, remove it from GetOptions() below and put 'suite|suites=s' here.
my @removed_options = (
);
Getopt::Long::Configure("pass_through"); Getopt::Long::Configure("pass_through");
GetOptions( GetOptions(
# Control what engine/variation to run # Control what engine/variation to run
...@@ -626,6 +648,9 @@ sub command_line_setup () { ...@@ -626,6 +648,9 @@ sub command_line_setup () {
'suite-timeout=i' => \$opt_suite_timeout, 'suite-timeout=i' => \$opt_suite_timeout,
'warnings|log-warnings' => \$opt_warnings, 'warnings|log-warnings' => \$opt_warnings,
# Options which are no longer used
(map { $_ => \&warn_about_removed_option } @removed_options),
'help|h' => \$opt_usage, 'help|h' => \$opt_usage,
) or usage("Can't read options"); ) or usage("Can't read options");
......
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