diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-08 08:53:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-08 08:53:34 +0200 |
| commit | 2e67e66c3a5107c0df21b56f387a896cdd2ec4e4 (patch) | |
| tree | 819bcd107a71c09e12ddd082e13b271b4a878173 /client | |
| parent | 6da2adfaa203fd9f76a32fa314b3c14f11ecddc1 (diff) | |
| parent | f1627045701b0dc0ff10ec09cca18dc5da351768 (diff) | |
| download | mariadb-git-2e67e66c3a5107c0df21b56f387a896cdd2ec4e4.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index daf25fea7c0..afdd2394bc3 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3339,6 +3339,8 @@ void do_exec(struct st_command *command) DBUG_ENTER("do_exec"); DBUG_PRINT("enter", ("cmd: '%s'", cmd)); + var_set_int("$sys_errno",0); + /* Skip leading space */ while (*cmd && my_isspace(charset_info, *cmd)) cmd++; @@ -3455,6 +3457,7 @@ void do_exec(struct st_command *command) report_or_die("command \"%s\" failed with wrong error: %d", command->first_argument, status); } + var_set_int("$sys_errno",status); } else if (command->expected_errors.err[0].type == ERR_ERRNO && command->expected_errors.err[0].code.errnum != 0) |