Skip to content

Commit 03d10b8

Browse files
author
Guilhem Bichot
committed
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).
1 parent 716c1bc commit 03d10b8

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

mysql-test/include/mysqld--help.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help
1111

1212
perl;
1313
@skipvars=qw/basedir open-files-limit general-log-file log
14-
log-slow-queries pid-file slow-query-log-file/;
14+
log-slow-queries pid-file slow-query-log-file
15+
datadir slave-load-tmpdir tmpdir/;
1516
@plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool ssl des-key-file
1617
thread-concurrency super-large-pages mutex-deadlock-detector/;
1718
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/;

mysql-test/r/mysqld--help-notwin.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ completion-type NO_CHAIN
744744
concurrent-insert AUTO
745745
connect-timeout 10
746746
console FALSE
747-
datadir MYSQLTEST_VARDIR/install.db/
748747
date-format %Y-%m-%d
749748
datetime-format %Y-%m-%d %H:%i:%s
750749
default-character-set latin1
@@ -898,7 +897,6 @@ skip-show-database FALSE
898897
skip-slave-start FALSE
899898
slave-compressed-protocol FALSE
900899
slave-exec-mode STRICT
901-
slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
902900
slave-net-timeout 3600
903901
slave-skip-errors (No default value)
904902
slave-transaction-retries 10
@@ -926,7 +924,6 @@ thread-stack 262144
926924
time-format %H:%i:%s
927925
timed-mutexes FALSE
928926
tmp-table-size 16777216
929-
tmpdir MYSQLTEST_VARDIR/tmp/
930927
transaction-alloc-block-size 8192
931928
transaction-isolation REPEATABLE-READ
932929
transaction-prealloc-size 4096

mysql-test/r/mysqld--help-win.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ completion-type NO_CHAIN
748748
concurrent-insert AUTO
749749
connect-timeout 10
750750
console FALSE
751-
datadir MYSQLTEST_VARDIR/install.db/
752751
date-format %Y-%m-%d
753752
datetime-format %Y-%m-%d %H:%i:%s
754753
default-character-set latin1
@@ -904,7 +903,6 @@ skip-show-database FALSE
904903
skip-slave-start FALSE
905904
slave-compressed-protocol FALSE
906905
slave-exec-mode STRICT
907-
slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
908906
slave-net-timeout 3600
909907
slave-skip-errors (No default value)
910908
slave-transaction-retries 10
@@ -932,7 +930,6 @@ thread-stack 262144
932930
time-format %H:%i:%s
933931
timed-mutexes FALSE
934932
tmp-table-size 16777216
935-
tmpdir MYSQLTEST_VARDIR/tmp/
936933
transaction-alloc-block-size 8192
937934
transaction-isolation REPEATABLE-READ
938935
transaction-prealloc-size 4096

0 commit comments

Comments
 (0)