diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:44:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:44:58 +0300 |
| commit | 7a3d34d6456ed719da62a896e5ac6e983b72f3d8 (patch) | |
| tree | 38dc1133cd53a366e7a851cfba6dad1269dcd5a1 /client | |
| parent | faeaf978b8c1deaa61d7d408fa6cb4ed03bfcfa3 (diff) | |
| parent | 1d45b3b055511d58c1e820ad497793f30871586e (diff) | |
| download | mariadb-git-7a3d34d6456ed719da62a896e5ac6e983b72f3d8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index b5232b99e91..139377d3889 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4636,8 +4636,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"))) { |