diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-30 12:53:36 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-30 12:53:36 +0200 |
| commit | c84973c7e09139c46433810f215aff17e9b8062a (patch) | |
| tree | 453e6a5c2af1a945a8439e5426a21273615e88ff /client | |
| parent | 71f9446308646b82a80d8053a2a7a3d6268173fb (diff) | |
| parent | be7b3c004066fba276471df861ffb6d90c88a883 (diff) | |
| download | mariadb-git-c84973c7e09139c46433810f215aff17e9b8062a.tar.gz | |
upmerge 52828
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 478985061f1..f332767879c 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3926,7 +3926,18 @@ void do_perl(struct st_command *command) if (!error) my_delete(temp_file_path, MYF(0)); - handle_command_error(command, WEXITSTATUS(error)); + /* Check for error code that indicates perl could not be started */ + int exstat= WEXITSTATUS(error); +#ifdef __WIN__ + if (exstat == 1) + /* Text must begin 'perl not found' as mtr looks for it */ + abort_not_supported_test("perl not found in path or did not start"); +#else + if (exstat == 127) + abort_not_supported_test("perl not found in path"); +#endif + else + handle_command_error(command, exstat); } dynstr_free(&ds_delimiter); DBUG_VOID_RETURN; |