summaryrefslogtreecommitdiff
path: root/storage/perfschema
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2015-11-26 11:21:56 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2016-03-18 17:24:12 +0100
commite5377457d80ddd7ffe7c358c88b7e9985d45b972 (patch)
tree6b1c53de9835eb98d074bba79a1c5088536ef048 /storage/perfschema
parente09299511e83f11f7476f7ea6c81ee12b00d7050 (diff)
downloadmariadb-git-e5377457d80ddd7ffe7c358c88b7e9985d45b972.tar.gz
MDEV-9058: protocol: COM_MULTI command (part 1)
Adding a command from the end of avaliable commands numering space (254)
Diffstat (limited to 'storage/perfschema')
-rw-r--r--storage/perfschema/pfs.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc
index dd61df5f861..dbe3241cfe8 100644
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -1444,7 +1444,9 @@ static void register_statement_v1(const char *category,
for (; count>0; count--, info++)
{
- DBUG_ASSERT(info->m_name != NULL);
+ if (info->m_name == NULL)
+ continue;
+
len= strlen(info->m_name);
full_length= prefix_length + len;
if (likely(full_length <= PFS_MAX_INFO_NAME_LENGTH))