Commit ebb8574b authored by Guilhem Bichot's avatar Guilhem Bichot

Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":

eliminate 3 more "directory path" variables from the test's output (it was already
the case for other similar ones likes slow-query-log-file).
parent 125cf0d4
...@@ -11,7 +11,8 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help ...@@ -11,7 +11,8 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help
perl; perl;
@skipvars=qw/basedir open-files-limit general-log-file log @skipvars=qw/basedir open-files-limit general-log-file log
log-slow-queries pid-file slow-query-log-file/; log-slow-queries pid-file slow-query-log-file
datadir slave-load-tmpdir tmpdir/;
@plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool ssl des-key-file @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool ssl des-key-file
thread-concurrency super-large-pages mutex-deadlock-detector/; thread-concurrency super-large-pages mutex-deadlock-detector/;
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/; @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/;
......
...@@ -744,7 +744,6 @@ completion-type NO_CHAIN ...@@ -744,7 +744,6 @@ completion-type NO_CHAIN
concurrent-insert AUTO concurrent-insert AUTO
connect-timeout 10 connect-timeout 10
console FALSE console FALSE
datadir MYSQLTEST_VARDIR/install.db/
date-format %Y-%m-%d date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s datetime-format %Y-%m-%d %H:%i:%s
default-character-set latin1 default-character-set latin1
...@@ -898,7 +897,6 @@ skip-show-database FALSE ...@@ -898,7 +897,6 @@ skip-show-database FALSE
skip-slave-start FALSE skip-slave-start FALSE
slave-compressed-protocol FALSE slave-compressed-protocol FALSE
slave-exec-mode STRICT slave-exec-mode STRICT
slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
slave-net-timeout 3600 slave-net-timeout 3600
slave-skip-errors (No default value) slave-skip-errors (No default value)
slave-transaction-retries 10 slave-transaction-retries 10
...@@ -926,7 +924,6 @@ thread-stack 262144 ...@@ -926,7 +924,6 @@ thread-stack 262144
time-format %H:%i:%s time-format %H:%i:%s
timed-mutexes FALSE timed-mutexes FALSE
tmp-table-size 16777216 tmp-table-size 16777216
tmpdir MYSQLTEST_VARDIR/tmp/
transaction-alloc-block-size 8192 transaction-alloc-block-size 8192
transaction-isolation REPEATABLE-READ transaction-isolation REPEATABLE-READ
transaction-prealloc-size 4096 transaction-prealloc-size 4096
......
...@@ -748,7 +748,6 @@ completion-type NO_CHAIN ...@@ -748,7 +748,6 @@ completion-type NO_CHAIN
concurrent-insert AUTO concurrent-insert AUTO
connect-timeout 10 connect-timeout 10
console FALSE console FALSE
datadir MYSQLTEST_VARDIR/install.db/
date-format %Y-%m-%d date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s datetime-format %Y-%m-%d %H:%i:%s
default-character-set latin1 default-character-set latin1
...@@ -904,7 +903,6 @@ skip-show-database FALSE ...@@ -904,7 +903,6 @@ skip-show-database FALSE
skip-slave-start FALSE skip-slave-start FALSE
slave-compressed-protocol FALSE slave-compressed-protocol FALSE
slave-exec-mode STRICT slave-exec-mode STRICT
slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
slave-net-timeout 3600 slave-net-timeout 3600
slave-skip-errors (No default value) slave-skip-errors (No default value)
slave-transaction-retries 10 slave-transaction-retries 10
...@@ -932,7 +930,6 @@ thread-stack 262144 ...@@ -932,7 +930,6 @@ thread-stack 262144
time-format %H:%i:%s time-format %H:%i:%s
timed-mutexes FALSE timed-mutexes FALSE
tmp-table-size 16777216 tmp-table-size 16777216
tmpdir MYSQLTEST_VARDIR/tmp/
transaction-alloc-block-size 8192 transaction-alloc-block-size 8192
transaction-isolation REPEATABLE-READ transaction-isolation REPEATABLE-READ
transaction-prealloc-size 4096 transaction-prealloc-size 4096
......
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