summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-25 10:20:45 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-25 10:20:45 +0100
commitde10e214115ecc89087386ecad8bddee2a1e1608 (patch)
tree7920f7d3b1d8ff90329b00177a8cc4242368d87b /client/mysqltest.cc
parent746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff)
parent9142c50b0751c1ee964b9b56ef2378fc2bef202c (diff)
downloadmariadb-git-de10e214115ecc89087386ecad8bddee2a1e1608.tar.gz
5.2 merge
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r--client/mysqltest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 2cf3faae0b6..32f9b56ac77 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -3927,7 +3927,10 @@ void do_change_user(struct st_command *command)
cur_con->name, ds_user.str, ds_passwd.str, ds_db.str));
if (mysql_change_user(mysql, ds_user.str, ds_passwd.str, ds_db.str))
- die("change user failed: %s", mysql_error(mysql));
+ handle_error(command, mysql_errno(mysql), mysql_error(mysql),
+ mysql_sqlstate(mysql), &ds_res);
+ else
+ handle_no_error(command);
dynstr_free(&ds_user);
dynstr_free(&ds_passwd);