Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel

mysql-test/r/ps.result

@@ -2090,14 +2090,6 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 deallocate prepare abc;
 drop view v1;
 drop table t1;
-create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so';
-call proc_1();
-ERROR HY000: No paths allowed for shared library
-call proc_1();
-ERROR HY000: No paths allowed for shared library
-call proc_1();
-ERROR HY000: No paths allowed for shared library
-drop procedure proc_1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
 call proc_1();
 ERROR HY000: Can't open shared library
@@ -2112,12 +2104,6 @@ select func_1(), func_1(), func_1() from dual;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
 ERROR 42000: FUNCTION test.func_1 does not exist
-prepare abc from "install plugin my_plug soname '/root/some_plugin.so'";
-execute abc;
-ERROR HY000: No paths allowed for shared library
-execute abc;
-ERROR HY000: No paths allowed for shared library
-deallocate prepare abc;
 prepare abc from "install plugin my_plug soname 'some_plugin.so'";
 deallocate prepare abc;
 create procedure proc_1() uninstall plugin my_plug;

mysql-test/r/ps_not_windows.result

+create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so';
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+drop procedure proc_1;
+prepare abc from "install plugin my_plug soname '/root/some_plugin.so'";
+execute abc;
+ERROR HY000: No paths allowed for shared library
+execute abc;
+ERROR HY000: No paths allowed for shared library
+deallocate prepare abc;

mysql-test/r/windows.result

@@ -6,3 +6,17 @@ use prn;
 ERROR 42000: Unknown database 'prn'
 create table nu (a int);
 drop table nu;
+create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll';
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+call proc_1();
+ERROR HY000: No paths allowed for shared library
+drop procedure proc_1;
+prepare abc from "install plugin my_plug soname '\\\\root\\\\some_plugin.dll'";
+execute abc;
+ERROR HY000: No paths allowed for shared library
+execute abc;
+ERROR HY000: No paths allowed for shared library
+deallocate prepare abc;

mysql-test/t/ps.test

@@ -2092,14 +2092,6 @@ drop view v1;
 drop table t1;
 
 
-create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so';
---error ER_UDF_NO_PATHS
-call proc_1();
---error ER_UDF_NO_PATHS
-call proc_1();
---error ER_UDF_NO_PATHS
-call proc_1();
-drop procedure proc_1;
 create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
 --replace_regex /(Can\'t open shared library).*$/\1/
 --error ER_CANT_OPEN_LIBRARY
@@ -2119,12 +2111,6 @@ delimiter ;|
 select func_1(), func_1(), func_1() from dual;
 --error ER_SP_DOES_NOT_EXIST
 drop function func_1;
-prepare abc from "install plugin my_plug soname '/root/some_plugin.so'";
---error ER_UDF_NO_PATHS
-execute abc;
---error ER_UDF_NO_PATHS
-execute abc;
-deallocate prepare abc;
 prepare abc from "install plugin my_plug soname 'some_plugin.so'";
 deallocate prepare abc;
 

mysql-test/t/ps_not_windows.test

+# Non-windows specific ps tests.
+--source include/not_windows.inc
+
+#
+# Bug #20665: All commands supported in Stored Procedures should work in
+# Prepared Statements
+#
+
+create procedure proc_1() install plugin my_plug soname '/root/some_plugin.so';
+--error ER_UDF_NO_PATHS
+call proc_1();
+--error ER_UDF_NO_PATHS
+call proc_1();
+--error ER_UDF_NO_PATHS
+call proc_1();
+drop procedure proc_1;
+
+prepare abc from "install plugin my_plug soname '/root/some_plugin.so'";
+--error ER_UDF_NO_PATHS
+execute abc;
+--error ER_UDF_NO_PATHS
+execute abc;
+deallocate prepare abc;

mysql-test/t/windows.test

@@ -18,3 +18,25 @@ create table nu (a int);
 drop table nu;
 
 # End of 4.1 tests
+
+#
+# Bug #20665: All commands supported in Stored Procedures should work in
+# Prepared Statements
+#
+
+create procedure proc_1() install plugin my_plug soname '\\root\\some_plugin.dll';
+--error ER_UDF_NO_PATHS
+call proc_1();
+--error ER_UDF_NO_PATHS
+call proc_1();
+--error ER_UDF_NO_PATHS
+call proc_1();
+drop procedure proc_1;
+
+prepare abc from "install plugin my_plug soname '\\\\root\\\\some_plugin.dll'";
+--error ER_UDF_NO_PATHS
+execute abc;
+--error ER_UDF_NO_PATHS
+execute abc;
+deallocate prepare abc;
+

sql/sql_binlog.cc

@@ -79,9 +79,15 @@ void mysql_client_binlog_statement(THD* thd)
     char const *endptr= 0;
     int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr);
 
+#ifndef HAVE_purify
+      /*
+        This debug printout should not be used for valgrind builds
+        since it will read from unassigned memory.
+      */
     DBUG_PRINT("info",
                ("bytes_decoded=%d; strptr=0x%lu; endptr=0x%lu ('%c':%d)",
                 bytes_decoded, strptr, endptr, *endptr, *endptr));
+#endif
 
     if (bytes_decoded < 0)
     {
@@ -147,8 +153,14 @@ void mysql_client_binlog_statement(THD* thd)
       DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code()));
       DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=0x%lx",
                          bufptr+EVENT_TYPE_OFFSET));
+#ifndef HAVE_purify
+      /*
+        This debug printout should not be used for valgrind builds
+        since it will read from unassigned memory.
+      */
       DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=0x%lx; buf[EVENT_LEN_OFFSET]=%u",
                           bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET)));
+#endif
       ev->thd= thd;
       if (int err= ev->exec_event(thd->rli_fake))
       {

sql/sql_class.cc

@@ -2727,11 +2727,17 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
                                         before_record);
   my_size_t const after_size= pack_row(table, cols, after_row, 
                                        after_record);
-  
+
+  /*
+    Don't print debug messages when running valgrind since they can
+    trigger false warnings.
+   */
+#ifndef HAVE_purify
   DBUG_DUMP("before_record", (const char *)before_record, table->s->reclength);
   DBUG_DUMP("after_record", (const char *)after_record, table->s->reclength);
   DBUG_DUMP("before_row", (const char *)before_row, before_size);
   DBUG_DUMP("after_row", (const char *)after_row, after_size);
+#endif
 
   Rows_log_event* const ev=
     binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,

storage/ndb/src/ndbapi/Ndbinit.cpp

@@ -146,12 +146,13 @@ Ndb::~Ndb()
   }
   doDisconnect();
 
-  delete theEventBuffer;
-
+  /* Disconnect from transporter to stop signals from coming in */
   if (theImpl->m_transporter_facade != NULL && theNdbBlockNumber > 0){
     theImpl->m_transporter_facade->close(theNdbBlockNumber, theFirstTransId);
   }
-  
+
+  delete theEventBuffer;
+
   releaseTransactionArrays();
 
   delete []theConnectionArray;