diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-14 16:42:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 2ac3121af2767186c489054db5d4871d04b8eef4 (patch) | |
| tree | 39de7dcc95c29fbd3d1ce3167262c61404e37743 /storage | |
| parent | 0ea717f51a152afdb3791195c4a25ee0baa2faac (diff) | |
| download | mariadb-git-2ac3121af2767186c489054db5d4871d04b8eef4.tar.gz | |
perfschema - various collateral cleanups and small changes
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/ut0stage.h | 2 | ||||
| -rw-r--r-- | storage/perfschema/pfs.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/include/ut0stage.h b/storage/innobase/include/ut0stage.h index 23ff32a60f9..71ace53cea0 100644 --- a/storage/innobase/include/ut0stage.h +++ b/storage/innobase/include/ut0stage.h @@ -41,8 +41,6 @@ Created Nov 12, 2014 Vasil Dimov #ifdef HAVE_PSI_STAGE_INTERFACE -typedef void PSI_stage_progress; - /** Class used to report ALTER TABLE progress via performance_schema. The only user of this class is the ALTER TABLE code and it calls the methods in the following order diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc index 23b9feab6ed..cc922d69d2c 100644 --- a/storage/perfschema/pfs.cc +++ b/storage/perfschema/pfs.cc @@ -1740,6 +1740,7 @@ void pfs_register_stage_v1(const char *category, DBUG_ASSERT(info != NULL); DBUG_ASSERT(info->m_name != NULL); len= (int)strlen(info->m_name); + DBUG_ASSERT(len <= 64); // see table_threads.cc near PROCESSLIST_STATE full_length= prefix_length + len; if (likely(full_length <= PFS_MAX_INFO_NAME_LENGTH)) { |