diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
| commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
| tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /include/my_rdtsc.h | |
| parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
| parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
| download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz | |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'include/my_rdtsc.h')
| -rw-r--r-- | include/my_rdtsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h index fb0ef0ef5b9..b2d30fa3151 100644 --- a/include/my_rdtsc.h +++ b/include/my_rdtsc.h @@ -90,7 +90,7 @@ C_MODE_START how to ensure that it can be accessed. On AARCH64, we use the generic timer base register. We override clang implementation for aarch64 as it access a PMU register which is not - guarenteed to be active. + guaranteed to be active. On RISC-V, we use the rdcycle instruction to read from mcycle register. Sadly, we have nothing for the Digital Alpha, MIPS, Motorola m68k, |