Skip to content
Permalink
Browse files

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

  • Loading branch information...
spetrunia committed Jun 21, 2019
2 parents 821b866 + 8d24f4e commit 75833ef9c51e3a2cc57fea048e55ed5670df7b0d
Showing with 11 additions and 1 deletion.
  1. +9 −1 client/mysqltest.cc
  2. +2 −0 mysql-test/mysql-test-run.pl
@@ -4643,8 +4643,16 @@ void do_perl(struct st_command *command)

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 */
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")))
{
@@ -366,6 +366,8 @@ ($)


sub main {
$ENV{MTR_PERL}=$^X;

# Default, verbosity on
report_option('verbose', 0);

0 comments on commit 75833ef

Please sign in to comment.
You can’t perform that action at this time.