diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
| commit | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (patch) | |
| tree | ec51a2bcd2a7c071f89d3177ca7914dccd111c9f /client | |
| parent | 5789f96c624d00aeef137602ab0c4828620748e8 (diff) | |
| parent | 3bac9cf7fe12c1b1c644ac7963c701b79b3127f3 (diff) | |
| download | mariadb-git-3797ca41b39c862cf4733eadea8c91ed138ca1a4.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysqltest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 99b8499faea..134f54757cb 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4091,7 +4091,7 @@ static int com_source(String *buffer, char *line) If we got an error during source operation, don't abort the client if ignore_errors is set */ - if (error && !batch_abort_on_error && ignore_errors) + if (error && ignore_errors) error= -1; // Ignore error return error; } diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 635d013eae8..4cc7ef813c3 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1876,7 +1876,7 @@ void check_result() if (access(reject_file, W_OK) == 0) { /* Result file directory is writable, save reject file there */ - fn_format(reject_file, result_file_name, NULL, + fn_format(reject_file, result_file_name, "", ".reject", MY_REPLACE_EXT); } else |