Merge branch 'merge-perfschema-5.6' into 10.0

storage/perfschema/ha_perfschema.cc

@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
   0x0001,
   pfs_status_vars,
   NULL,
-  "5.6.27",
+  "5.6.29",
   MariaDB_PLUGIN_MATURITY_STABLE
 }
 maria_declare_plugin_end;

storage/perfschema/table_session_connect.cc

-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -251,7 +251,8 @@ void table_session_connect::make_row(PFS_thread *pfs, uint ordinal)
                     &m_row.m_attr_value_length))
   {
     /* we don't expect internal threads to have connection attributes */
-    DBUG_ASSERT(pfs->m_processlist_id != 0);
+    if (pfs->m_processlist_id == 0)
+	return;
 
     m_row.m_ordinal_position= ordinal;
     m_row.m_process_id= pfs->m_processlist_id;