bk commit into 5.1 tree (davi:1.2600) BUG#31608

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-17 16:43:30-03:00, davi@stripped +3 -0
  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@stripped, 2007-10-17 16:43:26-03:00, davi@stripped +6 -0
    Close an open statement since it won't work after a change_user command.

  mysql-test/r/change_user.result@stripped, 2007-10-17 16:43:26-03:00, davi@stripped +2 -2
    Fixed test case output.

  mysql-test/t/change_user.test@stripped, 2007-10-17 16:43:26-03:00, davi@stripped +1 -1
    Fix test case output to return 1 or 0.

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2007-10-16 12:29:19 -03:00
+++ b/client/mysqltest.c	2007-10-17 16:43:26 -03:00
@@ -3063,6 +3063,12 @@ void do_change_user(struct st_command *c
                      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);
 
diff -Nrup a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
--- a/mysql-test/r/change_user.result	2007-10-16 12:29:20 -03:00
+++ b/mysql-test/r/change_user.result	2007-10-17 16:43:26 -03:00
@@ -34,8 +34,8 @@ NULL
 SELECT GET_LOCK('bug31418', 1);
 GET_LOCK('bug31418', 1)
 1
-SELECT IS_USED_LOCK('bug31418');
-IS_USED_LOCK('bug31418')
+SELECT IS_USED_LOCK('bug31418') = CONNECTION_ID();
+IS_USED_LOCK('bug31418') = CONNECTION_ID()
 1
 change_user
 SELECT IS_FREE_LOCK('bug31418');
diff -Nrup a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test
--- a/mysql-test/t/change_user.test	2007-10-16 12:29:19 -03:00
+++ b/mysql-test/t/change_user.test	2007-10-17 16:43:26 -03:00
@@ -28,7 +28,7 @@ SELECT @@session.sql_big_selects;
 SELECT IS_FREE_LOCK('bug31418');
 SELECT IS_USED_LOCK('bug31418');
 SELECT GET_LOCK('bug31418', 1);
-SELECT IS_USED_LOCK('bug31418');
+SELECT IS_USED_LOCK('bug31418') = CONNECTION_ID();
 --echo change_user
 --change_user
 SELECT IS_FREE_LOCK('bug31418');