diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 07:47:17 +0200 |
| commit | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch) | |
| tree | ce50324e5d1054f59a7178bfdb426189998baf52 /storage/perfschema | |
| parent | 745fd4b39f8aff6300682502ed2ddf61ee343866 (diff) | |
| parent | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff) | |
| download | mariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/perfschema/pfs_timer.h b/storage/perfschema/pfs_timer.h index a4f55c20994..4a73e2b66ee 100644 --- a/storage/perfschema/pfs_timer.h +++ b/storage/perfschema/pfs_timer.h @@ -100,7 +100,7 @@ extern enum_timer_name stage_timer; extern enum_timer_name statement_timer; /** Timer information data. - Characteristics about each suported timer. + Characteristics about each supported timer. */ extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info; |