1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge moksha.com.br:/Users/davi/mysql/bugs/31608-5.1

Browse Source 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
This commit is contained in:
unknown 2007-10-17 16:45:49 -03:00
commit c0d2ce4c88
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.c
View File

@ -3063,6 +3063,12 @@ void do_change_user(struct st_command *command)
sizeof(change_user_args)/sizeof(struct command_arg), 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) if (!ds_user.length)
dynstr_set(&ds_user, mysql->user); dynstr_set(&ds_user, mysql->user);

4
mysql-test/r/change_user.result
View File

@ -34,8 +34,8 @@ NULL
SELECT GET_LOCK('bug31418', 1); SELECT GET_LOCK('bug31418', 1);
GET_LOCK('bug31418', 1) GET_LOCK('bug31418', 1)
1 1
SELECT IS_USED_LOCK('bug31418'); SELECT IS_USED_LOCK('bug31418') = CONNECTION_ID();
IS_USED_LOCK('bug31418') IS_USED_LOCK('bug31418') = CONNECTION_ID()
1 1
change_user change_user
SELECT IS_FREE_LOCK('bug31418'); SELECT IS_FREE_LOCK('bug31418');

2
mysql-test/t/change_user.test
View File

@ -28,7 +28,7 @@ SELECT @@session.sql_big_selects;
SELECT IS_FREE_LOCK('bug31418'); SELECT IS_FREE_LOCK('bug31418');
SELECT IS_USED_LOCK('bug31418'); SELECT IS_USED_LOCK('bug31418');
SELECT GET_LOCK('bug31418', 1); SELECT GET_LOCK('bug31418', 1);
SELECT IS_USED_LOCK('bug31418'); SELECT IS_USED_LOCK('bug31418') = CONNECTION_ID();
--echo change_user --echo change_user
--change_user --change_user
SELECT IS_FREE_LOCK('bug31418'); SELECT IS_FREE_LOCK('bug31418');