diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-24 20:02:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-24 20:02:00 +0100 |
| commit | bd4e7dac59f890c0a687a7f96af0fa768e82f180 (patch) | |
| tree | 7f4d8d1369589cbfff2a0bb9fcc583635c0d9cd4 | |
| parent | c11c64e97208af18bbf2a1d684af19efbbed495e (diff) | |
| download | mariadb-git-bd4e7dac59f890c0a687a7f96af0fa768e82f180.tar.gz | |
mysqltest bug: reset --replace command after every
error message (because error messages use replacements)
| -rw-r--r-- | client/mysqltest.cc | 1 | ||||
| -rw-r--r-- | mysql-test/t/failed_auth_unixsocket.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 7ceaed1a1da..57050e685d8 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7916,6 +7916,7 @@ void handle_error(struct st_command *command, DBUG_ENTER("handle_error"); + command->used_replace= 1; if (command->require_file) { /* diff --git a/mysql-test/t/failed_auth_unixsocket.test b/mysql-test/t/failed_auth_unixsocket.test index fdde7399fc3..ba31cf6a59f 100644 --- a/mysql-test/t/failed_auth_unixsocket.test +++ b/mysql-test/t/failed_auth_unixsocket.test @@ -20,6 +20,7 @@ eval install plugin unix_socket soname '$AUTH_SOCKET_SO'; --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR connect (fail,localhost,$USER); +--replace_result $USER USER --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR change_user $USER; |