1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.2' of github.com:MariaDB/server into 10.2

Browse Source
This commit is contained in:
Sergei Petrunia 2019-06-21 14:20:03 +03:00
commit 75833ef9c5
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/mysqltest.cc
View File

@ -4643,8 +4643,16 @@ void do_perl(struct st_command *command)
str_to_file(temp_file_path, ds_script.str, ds_script.length); str_to_file(temp_file_path, ds_script.str, ds_script.length);
/* Use the same perl executable as the one that runs mysql-test-run.pl */
const char *mtr_perl=getenv("MTR_PERL");
if (!mtr_perl)
mtr_perl="perl";
/* Format the "perl <filename>" command */ /* Format the "perl <filename>" command */
my_snprintf(buf, sizeof(buf), "perl %s", temp_file_path); if (strchr(mtr_perl, ' '))
my_snprintf(buf, sizeof(buf), "\"%s\" %s", mtr_perl, temp_file_path);
else
my_snprintf(buf, sizeof(buf), "%s %s", mtr_perl, temp_file_path);
if (!(res_file= my_popen(buf, "r"))) if (!(res_file= my_popen(buf, "r")))
{ {

2
mysql-test/mysql-test-run.pl
View File

@ -366,6 +366,8 @@ main();
sub main { sub main {
$ENV{MTR_PERL}=$^X;
# Default, verbosity on # Default, verbosity on
report_option('verbose', 0); report_option('verbose', 0);