fixes for buildbot:

update test results
fix compilation failure on windows
fix for ps-protocol

mysql-test/r/plugin.result:
  make sure the PS handle is closed
mysql-test/t/plugin.test:
  make sure the PS handle is closed
sql/mysqld.cc:
  compilation failure: lable without a statement.
sql/sql_plugin.cc:
  make plugin lock and plugin unlock use the same format of the dbug info string.
  print the ref_count *after* the lock and *after* the unlock.

1 files changed, 8 insertions, 3 deletions

diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test
index eedaebc25db..a7f3c693389 100644
--- a/mysql-test/t/plugin.test
+++ b/mysql-test/t/plugin.test
@@ -106,13 +106,18 @@ alter table t1 change a a int complex='c,c,c';
 show create table t1;
 drop table t1;
 
-
 --echo #illegal value error
 SET SQL_MODE='';
 --error ER_BAD_OPTION_VALUE
 CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS;
-
 SET @@SQL_MODE=@OLD_SQL_MODE;
 
-
+#
+# The only preparable statement above was CREATE TABLE. 
+# We need to prepare another statement here to force the
+# previous one to be deallocated (mysqltest reuses the same handle)
+# and to unlock all thread-local plugin locks. Otherwise it won't
+# uninstall.
+#
+select 1;
 UNINSTALL PLUGIN example;