diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-16 19:15:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-16 19:15:55 +0100 |
| commit | b6bcd0fc927656033db5f506f8b9b79a78eb9d5f (patch) | |
| tree | 5ff55feac26ba791d727a124baf03729b80d8850 /storage | |
| parent | 17a792a4411890cde083d2e6d6a461b88c39cb7c (diff) | |
| parent | 7e22a1d843b64f081dbe49c8bb303ca55cc5abf8 (diff) | |
| download | mariadb-git-b6bcd0fc927656033db5f506f8b9b79a78eb9d5f.tar.gz | |
Merge branch 'merge-perfschema-5.6' into 10.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/table_session_connect.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 21a5262a2f1..6c69594b91a 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/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; diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc index df3337b284c..a8cf199b651 100644 --- a/storage/perfschema/table_session_connect.cc +++ b/storage/perfschema/table_session_connect.cc @@ -1,4 +1,4 @@ -/* 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; |