From: Alexander Nozdrin
Date: March 14 2011 11:03am
Subject: bzr commit into mysql-5.5 branch (alexander.nozdrin:3367) Bug#11765297
List-Archive: http://lists.mysql.com/commits/132881
X-Bug: 11765297
Message-Id: <201103141103.p2EB3Ga2027207@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3718235901498230490=="

--===============3718235901498230490==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00/bug58251/mysql-5.5-bug58251/ based on revid:joerg.bruehe@stripped

 3367 Alexander Nozdrin	2011-03-14
      A patch for Bug#11765297 (58251 - archive_plugin and blackhole_plugin
      fails when running with ps-protocol).
      
      The problem was that when running in --ps-protocol mode mysqltest.cc
      didn't close created prepared statements. So, the plugins could not be
      unistalled because there was a prepared statement using them.
      
      A fix is to add a dummy statement that forces mysqltest.cc to close
      the last prepared statement (which uses a plugin-defined table).

    modified:
      mysql-test/r/archive_plugin.result
      mysql-test/r/blackhole_plugin.result
      mysql-test/t/archive_plugin.test
      mysql-test/t/blackhole_plugin.test
=== modified file 'mysql-test/r/archive_plugin.result'
--- a/mysql-test/r/archive_plugin.result	2010-04-26 19:39:24 +0000
+++ b/mysql-test/r/archive_plugin.result	2011-03-14 11:03:08 +0000
@@ -10,6 +10,9 @@ UNINSTALL PLUGIN archive;
 INSTALL PLUGIN archive SONAME 'ha_archive.so';
 CREATE TABLE t1(a int) ENGINE=ARCHIVE;
 DROP TABLE t1;
+SELECT 1;
+1
+1
 UNINSTALL PLUGIN archive;
 UNINSTALL PLUGIN archive;
 ERROR 42000: PLUGIN archive does not exist

=== modified file 'mysql-test/r/blackhole_plugin.result'
--- a/mysql-test/r/blackhole_plugin.result	2010-04-26 18:44:10 +0000
+++ b/mysql-test/r/blackhole_plugin.result	2011-03-14 11:03:08 +0000
@@ -10,6 +10,9 @@ UNINSTALL PLUGIN blackhole;
 INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
 CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
 DROP TABLE t1;
+SELECT 1;
+1
+1
 UNINSTALL PLUGIN blackhole;
 UNINSTALL PLUGIN blackhole;
 ERROR 42000: PLUGIN blackhole does not exist

=== modified file 'mysql-test/t/archive_plugin.test'
--- a/mysql-test/t/archive_plugin.test	2010-06-14 09:23:49 +0000
+++ b/mysql-test/t/archive_plugin.test	2011-03-14 11:03:08 +0000
@@ -20,6 +20,14 @@ CREATE TABLE t1(a int) ENGINE=ARCHIVE;
 
 DROP TABLE t1;
 
+# This dummy statement is required for --ps-protocol mode.
+# The thing is that last prepared statement is "cached" in mysqltest.cc
+# (unless "reconnect" is enabled, and that's not the case here).
+# This statement forces mysqltest.cc to close prepared "DROP TABLE t1".
+# Otherwise, the plugin can not be uninstalled because there is an active
+# prepared statement using it.
+SELECT 1;
+
 UNINSTALL PLUGIN archive;
 
 --error ER_SP_DOES_NOT_EXIST 

=== modified file 'mysql-test/t/blackhole_plugin.test'
--- a/mysql-test/t/blackhole_plugin.test	2010-06-14 09:23:49 +0000
+++ b/mysql-test/t/blackhole_plugin.test	2011-03-14 11:03:08 +0000
@@ -20,6 +20,14 @@ CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
 
 DROP TABLE t1;
 
+# This dummy statement is required for --ps-protocol mode.
+# The thing is that last prepared statement is "cached" in mysqltest.cc
+# (unless "reconnect" is enabled, and that's not the case here).
+# This statement forces mysqltest.cc to close prepared "DROP TABLE t1".
+# Otherwise, the plugin can not be uninstalled because there is an active
+# prepared statement using it.
+SELECT 1;
+
 UNINSTALL PLUGIN blackhole;
 --error ER_SP_DOES_NOT_EXIST
 UNINSTALL PLUGIN blackhole;


--===============3718235901498230490==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   avxfnzy61z9vtlqz
# target_branch: file:///home/alik/MySQL/bzr/00/bug58251/mysql-5.5-\
#   bug58251/
# testament_sha1: 53a97ebfac094e46dcb429647724ec6a6b46a55f
# timestamp: 2011-03-14 14:03:12 +0300
# base_revision_id: joerg.bruehe@stripped\
#   mu5oedwd80yweb7m
# 
# Begin bundle
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


--===============3718235901498230490==--