BUG#28316456: BACKPORT MYSQLTEST_VARDIR_ABS TO 5.7

Pavan Naik · Pavan Naik · commit eaf6b467c2b1 · 2018-07-12T11:49:40.000+05:30
Back-port the environment variable $MYSQLTEST_VARDIR_ABS to mysql-5.7.

Change-Id: I7f7a0f48939be6bf3b47e5c565ea848689ffca20
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -78,6 +78,7 @@ BEGIN
 use lib "lib";
 
 use Cwd;
+use Cwd 'abs_path';
 use Getopt::Long;
 use My::File::Path; # Patched version of File::Path
 use File::Basename;
@@ -2611,14 +2612,14 @@ sub environment_setup {
   if (IS_WINDOWS)
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."\\std_data";
-    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
-                              $opt_tmpdir . "\\.mylogin.cnf";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "\\.mylogin.cnf";
+    $ENV{'MYSQLTEST_VARDIR_ABS'}= $opt_vardir;
   }
   else
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."/std_data";
-    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
-                              $opt_tmpdir . "/.mylogin.cnf";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "/.mylogin.cnf";
+    $ENV{'MYSQLTEST_VARDIR_ABS'}= abs_path("$opt_vardir");
   }
     
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ BEGIN`
`78`	`78`	`use lib "lib";`
`79`	`79`
`80`	`80`	`use Cwd;`
	`81`	`+use Cwd 'abs_path';`
`81`	`82`	`use Getopt::Long;`
`82`	`83`	`use My::File::Path; # Patched version of File::Path`
`83`	`84`	`use File::Basename;`
`@@ -2611,14 +2612,14 @@ sub environment_setup {`
`2611`	`2612`	`if (IS_WINDOWS)`
`2612`	`2613`	`{`
`2613`	`2614`	`$ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."\\std_data";`
`2614`		`- $ENV{'MYSQL_TEST_LOGIN_FILE'}=`
`2615`		`- $opt_tmpdir . "\\.mylogin.cnf";`
	`2615`	`+ $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "\\.mylogin.cnf";`
	`2616`	`+ $ENV{'MYSQLTEST_VARDIR_ABS'}= $opt_vardir;`
`2616`	`2617`	`}`
`2617`	`2618`	`else`
`2618`	`2619`	`{`
`2619`	`2620`	`$ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."/std_data";`
`2620`		`- $ENV{'MYSQL_TEST_LOGIN_FILE'}=`
`2621`		`- $opt_tmpdir . "/.mylogin.cnf";`
	`2621`	`+ $ENV{'MYSQL_TEST_LOGIN_FILE'}= $opt_tmpdir . "/.mylogin.cnf";`
	`2622`	`+ $ENV{'MYSQLTEST_VARDIR_ABS'}= abs_path("$opt_vardir");`
`2622`	`2623`	`}`
`2623`	`2624`
`2624`	`2625`