summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <davi@moksha.com.br>2007-10-17 16:43:30 -0300
committerunknown <davi@moksha.com.br>2007-10-17 16:43:30 -0300
commite51257282733c2497a01f8b30ee95e7e214d210b (patch)
treeebf72c913456132b6fdcdf0f1ee8cb00382a629e /client
parent88e5aa69f786c25bde3b895230bd3c04c3aa717b (diff)
downloadmariadb-git-e51257282733c2497a01f8b30ee95e7e214d210b.tar.gz
Bug#31608 missing mysqltest change_user command
Post merge fixes: close any open statement before the change user command and fix test case output. client/mysqltest.c: Close an open statement since it won't work after a change_user command. mysql-test/r/change_user.result: Fixed test case output. mysql-test/t/change_user.test: Fix test case output to return 1 or 0.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 7a84ec8cf40..90df546babf 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -3063,6 +3063,12 @@ void do_change_user(struct st_command *command)
sizeof(change_user_args)/sizeof(struct command_arg),
',');
+ if (cur_con->stmt)
+ {
+ mysql_stmt_close(cur_con->stmt);
+ cur_con->stmt= NULL;
+ }
+
if (!ds_user.length)
dynstr_set(&ds_user, mysql->user);