database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-17 07:58:41 +02:00
parent 023d986732 097e2f9d0a
commit c7ba92372b
17 changed files with 221 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/perfschema/pfs_instr_class.cc
View File

@@ -1007,7 +1007,8 @@ static void init_instr_class(PFS_instr_class *klass,
{
DBUG_ASSERT(name_length <= PFS_MAX_INFO_NAME_LENGTH);
memset(klass, 0, sizeof(PFS_instr_class));
memcpy(klass->m_name, name, name_length);
strncpy(klass->m_name, name, name_length);
klass->m_name[PFS_MAX_INFO_NAME_LENGTH - 1]= '\0';
klass->m_name_length= name_length;
klass->m_flags= flags;
klass->m_enabled= true;