database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

disable getopt prefix matching in mtr bootstrap

Browse Source 
it was disabled in mtr tests in 4280b25ed8
This commit is contained in:
Sergei Golubchik
2017-05-04 17:18:45 +02:00
parent e333d82964
commit d4007f2e73
4 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/mysql-test-run.pl
View File

@ -3105,6 +3105,7 @@ sub mysql_install_db {
my $args; my $args;
mtr_init_args(\$args); mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults"); mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--disable-getopt-prefix-matching");
mtr_add_arg($args, "--bootstrap"); mtr_add_arg($args, "--bootstrap");
mtr_add_arg($args, "--basedir=%s", $install_basedir); mtr_add_arg($args, "--basedir=%s", $install_basedir);
mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--datadir=%s", $install_datadir);

2
mysql-test/r/mysqld--help.result
View File

@ -1200,7 +1200,7 @@ ft-query-expansion-limit 20
ft-stopword-file (No default value) ft-stopword-file (No default value)
gdb FALSE gdb FALSE
general-log FALSE general-log FALSE
getopt-prefix-matching TRUE getopt-prefix-matching FALSE
group-concat-max-len 1024 group-concat-max-len 1024
gtid-domain-id 0 gtid-domain-id 0
gtid-ignore-duplicates FALSE gtid-ignore-duplicates FALSE

2
mysql-test/suite/perfschema/r/bad_option_2.result
View File

@ -1 +1 @@
Found: ambiguous option '--performance-schema-max_=12' FOUND /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt

25
mysql-test/suite/perfschema/t/bad_option_2.test
View File

@ -8,26 +8,9 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt;
--error 0,1 --error 0,1
--remove_file $outfile --remove_file $outfile
--error 3 --error 3
--exec $MYSQLD_BOOTSTRAP_CMD --loose-console --performance-schema-max_=12 > $outfile 2>&1 --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'
perl; --let SEARCH_FILE=$outfile
use strict; --source include/search_pattern_in_file.inc
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
--remove_file $outfile --remove_file $outfile