diff options
| author | Michael Widenius <monty@mariadb.org> | 2017-06-18 12:28:40 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:53 +0200 |
| commit | cc77f9882dcaa4e02196bb3847cd66f2943eb4c6 (patch) | |
| tree | e394e188978a41d0c4eca65aafe917310315c9e1 /storage/perfschema | |
| parent | 874e4e473acc7087fc8e375e9de2b5d1e846b7e9 (diff) | |
| download | mariadb-git-cc77f9882dcaa4e02196bb3847cd66f2943eb4c6.tar.gz | |
Changed KEY names to use LEX_CSTRING
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_instr_class.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/perfschema/pfs_instr_class.cc b/storage/perfschema/pfs_instr_class.cc index c67c120283d..8f2fdc2594e 100644 --- a/storage/perfschema/pfs_instr_class.cc +++ b/storage/perfschema/pfs_instr_class.cc @@ -1193,8 +1193,8 @@ static void set_keys(PFS_table_share *pfs, const TABLE_SHARE *share) for ( ; pfs_key < pfs_key_last; pfs_key++, key_info++) { - len= strlen(key_info->name); - memcpy(pfs_key->m_name, key_info->name, len); + len= key_info->name.length; + memcpy(pfs_key->m_name, key_info->name.str, len); pfs_key->m_name_length= len; } @@ -1215,11 +1215,11 @@ static int compare_keys(PFS_table_share *pfs, const TABLE_SHARE *share) for ( ; pfs_key < pfs_key_last; pfs_key++, key_info++) { - len= strlen(key_info->name); + len= key_info->name.length; if (len != pfs_key->m_name_length) return 1; - if (memcmp(pfs_key->m_name, key_info->name, len) != 0) + if (memcmp(pfs_key->m_name, key_info->name.str, len) != 0) return 1; } |