bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2875) Bug#49269

[Bjorn Munch]

#At file:///home/bm136801/my/case-51/ based on revid:bjorn.munch@stripped

 2875 Bjorn Munch	2010-01-06
      Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
      Small amendment: ignore pending reap when switching connection, add test

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-01-06 08:45:28 +0000
+++ b/client/mysqltest.cc	2010-01-06 11:56:22 +0000
@@ -4622,6 +4622,7 @@ void select_connection_name(const char *
   if (!con)
     die("connection '%s' not found in connection pool", name);
 
+  con->pending= FALSE;
   set_current_connection(con);
 
   DBUG_VOID_RETURN;

=== modified file 'mysql-test/r/mysqltest.result'
--- a/mysql-test/r/mysqltest.result	2010-01-06 08:47:25 +0000
+++ b/mysql-test/r/mysqltest.result	2010-01-06 11:56:22 +0000
@@ -542,6 +542,13 @@ f1
 Abcd
 mysqltest: At line 2: Cannot run query on connection between send and reap
 select * from t1;;
+select * from t1;;
+select 1;
+1
+1
+select 2;
+2
+2
 drop table t1;
 mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
 mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'

=== modified file 'mysql-test/t/mysqltest.test'
--- a/mysql-test/t/mysqltest.test	2010-01-06 08:47:25 +0000
+++ b/mysql-test/t/mysqltest.test	2010-01-06 11:56:22 +0000
@@ -1654,6 +1654,18 @@ EOF
 --exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in 2>&1
 remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.in;
 
+# 7. Test that stmt after send without reap IS allowed 
+#    if we have switched connections
+
+connect (test_con1,localhost,root,,);
+--send select * from t1;
+connection default;
+select 1;
+connection test_con1;
+select 2;
+disconnect test_con1;
+connection default;
+
 drop table t1;
 
 # ----------------------------------------------------------------------------


Attachment: [text/bzr-bundle] bzr/[e-mail]