diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 19:50:04 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 19:50:04 +0200 |
| commit | 3e39771551a3a055fcb089dbcd4a5f284cccb16b (patch) | |
| tree | 501bcc26e61091861a010412a87dc2241bfd0f4c /mysql-test/mysql-test-run.pl | |
| parent | 9584c6753e7e63ca18aaea59cde4efaa036b6944 (diff) | |
| parent | 08c493c62afae0e81f9da6bb9b86efe99a9a763d (diff) | |
| download | mariadb-git-3e39771551a3a055fcb089dbcd4a5f284cccb16b.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index aae314e8370..88651907d3f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5057,9 +5057,9 @@ sub mysqld_start ($$) { } - # "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start. - # Use it to restart the server at testing a failing server start (e.g - # due to incompatible options). + # Command line for mysqld started for *this particular test*. + # Differs from "generic" MYSQLD_CMD by including all command line + # options from *.opt and *.combination files. $ENV{'MYSQLD_LAST_CMD'}= "$exe @$args"; if ( $opt_gdb || $opt_manual_gdb ) |