Commit d4007f2e authored by Sergei Golubchik's avatar Sergei Golubchik

disable getopt prefix matching in mtr bootstrap

it was disabled in mtr tests in 4280b25e
parent e333d829
......@@ -3105,6 +3105,7 @@ sub mysql_install_db {
my $args;
mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--disable-getopt-prefix-matching");
mtr_add_arg($args, "--bootstrap");
mtr_add_arg($args, "--basedir=%s", $install_basedir);
mtr_add_arg($args, "--datadir=%s", $install_datadir);
......
......@@ -1200,7 +1200,7 @@ ft-query-expansion-limit 20
ft-stopword-file (No default value)
gdb FALSE
general-log FALSE
getopt-prefix-matching TRUE
getopt-prefix-matching FALSE
group-concat-max-len 1024
gtid-domain-id 0
gtid-ignore-duplicates FALSE
......
Found: ambiguous option '--performance-schema-max_=12'
FOUND /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt
......@@ -8,26 +8,9 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt;
--error 0,1
--remove_file $outfile
--error 3
--exec $MYSQLD_BOOTSTRAP_CMD --loose-console --performance-schema-max_=12 > $outfile 2>&1
perl;
use strict;
use warnings;
my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_2.txt";
open(FILE, "<", $fname) or die;
my @lines= <FILE>;
# those must be in the file for the test to pass
my @patterns=
("ambiguous option '--performance-schema-max_=12'");
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
--exec $MYSQLD_BOOTSTRAP_CMD --loose-console --enable-getopt-prefix-matching --performance-schema-max_=12 > $outfile 2>&1
--let SEARCH_PATTERN=ambiguous option '--performance-schema-max_=12'
--let SEARCH_FILE=$outfile
--source include/search_pattern_in_file.inc
--remove_file $outfile
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