Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d4007f2e
Commit
d4007f2e
authored
May 04, 2017
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable getopt prefix matching in mtr bootstrap
it was disabled in mtr tests in
4280b25e
parent
e333d829
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
23 deletions
+7
-23
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-0
mysql-test/r/mysqld--help.result
mysql-test/r/mysqld--help.result
+1
-1
mysql-test/suite/perfschema/r/bad_option_2.result
mysql-test/suite/perfschema/r/bad_option_2.result
+1
-1
mysql-test/suite/perfschema/t/bad_option_2.test
mysql-test/suite/perfschema/t/bad_option_2.test
+4
-21
No files found.
mysql-test/mysql-test-run.pl
View file @
d4007f2e
...
...
@@ -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
);
...
...
mysql-test/r/mysqld--help.result
View file @
d4007f2e
...
...
@@ -1200,7 +1200,7 @@ ft-query-expansion-limit 20
ft-stopword-file (No default value)
gdb FALSE
general-log FALSE
getopt-prefix-matching
TRU
E
getopt-prefix-matching
FALS
E
group-concat-max-len 1024
gtid-domain-id 0
gtid-ignore-duplicates FALSE
...
...
mysql-test/suite/perfschema/r/bad_option_2.result
View file @
d4007f2e
F
ound: ambiguous option '--performance-schema-max_=12'
F
OUND /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt
mysql-test/suite/perfschema/t/bad_option_2.test
View file @
d4007f2e
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment