10.0-base merge

4 files changed, 5 insertions, 5 deletions

diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index ccb8c77d573..d3de38d025c 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -130,7 +130,7 @@
   mode when a server is installed.
 
   The implementation of the database creation script is located in
-  @verbatim ./scripts/mysql_system_tables.sql @endverbatim
+  @verbatim ./scripts/mysql_performance_tables.sql @endverbatim
 
   @subsection INT_CONFIG Runtime configuration interface
 
diff --git a/storage/perfschema/pfs_check.cc b/storage/perfschema/pfs_check.cc
index c52be6f0da2..2ab54ab1a4a 100644
--- a/storage/perfschema/pfs_check.cc
+++ b/storage/perfschema/pfs_check.cc
@@ -56,6 +56,8 @@ void check_performance_schema()
   PFS_engine_table_share::check_all_tables(thd);
 
   delete thd;
+  /* Remember that we don't have a THD */
+  set_current_thd(0);
   DBUG_VOID_RETURN;
 }
 
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc
index 44d424e9df6..39caabaf030 100644
--- a/storage/perfschema/pfs_instr.cc
+++ b/storage/perfschema/pfs_instr.cc
@@ -998,8 +998,6 @@ PFS_socket *sanitize_socket(PFS_socket *unsafe)
 */
 void destroy_thread(PFS_thread *pfs)
 {
-  DBUG_ENTER("destroy_thread");
-
   DBUG_ASSERT(pfs != NULL);
   if (pfs->m_account != NULL)
   {
@@ -1062,7 +1060,6 @@ void destroy_thread(PFS_thread *pfs)
     pfs->m_digest_hash_pins= NULL;
   }
   pfs->m_lock.allocated_to_free();
-  DBUG_VOID_RETURN;
 }
 
 /**
diff --git a/storage/perfschema/pfs_server.cc b/storage/perfschema/pfs_server.cc
index daf842d1248..3df0f27f652 100644
--- a/storage/perfschema/pfs_server.cc
+++ b/storage/perfschema/pfs_server.cc
@@ -209,7 +209,8 @@ void shutdown_performance_schema(void)
 */
 void init_pfs_instrument_array()
 {
-  my_init_dynamic_array(&pfs_instr_config_array, sizeof(PFS_instr_config*), 10, 10);
+  my_init_dynamic_array(&pfs_instr_config_array, sizeof(PFS_instr_config*),
+                        10, 10, MYF(0));
   pfs_instr_config_state=  PFS_INSTR_CONFIG_ALLOCATED;
 }