diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-16 18:56:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-16 18:56:39 +0100 |
| commit | 7e22a1d843b64f081dbe49c8bb303ca55cc5abf8 (patch) | |
| tree | 3473282a23e4011e0544c8ac5bfd78ebbbd9c31d /storage | |
| parent | 6bb292f1bc6781639533fbe0c681b1d86bb7ef3e (diff) | |
| download | mariadb-git-7e22a1d843b64f081dbe49c8bb303ca55cc5abf8.tar.gz | |
5.6.29
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/table_session_connect.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc index bea9b7c94db..70e89c0b195 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; |