Bug#18184868: CANNOT USE BOOTSTRAP VARIABLES IN -MASTER.OPT FILE

Deepa Dixit · Deepa Dixit · commit dea54309319f · 2017-02-16T12:10:14.000+05:30
Post-push fix: Bootstrap.sql was not being deleted after server
initialization during parallel runs, because MTR was looking
for it in the wrong location. This commit fixes the problem.

Reviewed-by: Pavan Naik &lt;pavan.naik@oracle.com&gt;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -6573,12 +6573,11 @@ ($)
     {
       clean_dir($datadir);
       mysql_install_db($mysqld, $datadir, $bootstrap_opts);
-      my $vardir_path= ($opt_parallel == 1) ? "$opt_vardir" : "$opt_vardir/..";
 
       # Remove the bootstrap.sql file so that a duplicate set of
       # SQL statements do not get written to the same file.
-      unlink("$vardir_path/tmp/bootstrap.sql")
-        if (-f "$vardir_path/tmp/bootstrap.sql");
+      unlink("$opt_vardir/tmp/bootstrap.sql")
+        if (-f "$opt_vardir/tmp/bootstrap.sql");
     }
 
     # Create the servers tmpdir

Original file line number	Diff line number	Diff line change
`@@ -6573,12 +6573,11 @@ ($)`
`6573`	`6573`	`{`
`6574`	`6574`	`clean_dir($datadir);`
`6575`	`6575`	`mysql_install_db($mysqld, $datadir, $bootstrap_opts);`
`6576`		`- my $vardir_path= ($opt_parallel == 1) ? "$opt_vardir" : "$opt_vardir/..";`
`6577`	`6576`
`6578`	`6577`	`# Remove the bootstrap.sql file so that a duplicate set of`
`6579`	`6578`	`# SQL statements do not get written to the same file.`
`6580`		`- unlink("$vardir_path/tmp/bootstrap.sql")`
`6581`		`- if (-f "$vardir_path/tmp/bootstrap.sql");`
	`6579`	`+ unlink("$opt_vardir/tmp/bootstrap.sql")`
	`6580`	`+ if (-f "$opt_vardir/tmp/bootstrap.sql");`
`6582`	`6581`	`}`
`6583`	`6582`
`6584`	`6583`	`# Create the servers tmpdir`