diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 10:18:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 10:18:30 +0200 |
| commit | 73ecab3d26c055928673a2629f4513aa7008dbf0 (patch) | |
| tree | b04760b3369cd1d8fc03c7dec204f5a371335b29 /storage/perfschema | |
| parent | 7d1df207c4ded0ac8aa61f0d35bcae7eda974c54 (diff) | |
| parent | 71e8e4934db06c02db1b51716e9d4b3992505161 (diff) | |
| download | mariadb-git-73ecab3d26c055928673a2629f4513aa7008dbf0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_timer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_timer.cc b/storage/perfschema/pfs_timer.cc index 505e49de968..36cd0df141d 100644 --- a/storage/perfschema/pfs_timer.cc +++ b/storage/perfschema/pfs_timer.cc @@ -167,7 +167,7 @@ void init_timers(void) /* For STAGE and STATEMENT, a timer with a fixed frequency is better. - The prefered timer is nanosecond, or lower resolutions. + The preferred timer is nanosecond, or lower resolutions. */ if (nanosec_to_pico != 0) @@ -209,7 +209,7 @@ void init_timers(void) /* For IDLE, a timer with a fixed frequency is critical, as the CPU clock may slow down a lot if the server is completely idle. - The prefered timer is microsecond, or lower resolutions. + The preferred timer is microsecond, or lower resolutions. */ if (microsec_to_pico != 0) |