diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-24 10:21:26 +0300 |
| commit | 6ce0a6f9ad77e7934e27db1b73d6d98064352928 (patch) | |
| tree | 351d7da0892c9a78310ffc39754c3ec4b38a188e /include/my_sys.h | |
| parent | b5c050563b1bfa1155b3b6a3b7c0c59775e77f13 (diff) | |
| parent | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (diff) | |
| download | mariadb-git-6ce0a6f9ad77e7934e27db1b73d6d98064352928.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 68e52d13fff..dceae9b889e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -905,18 +905,10 @@ extern int my_compress_buffer(uchar *dest, size_t *destLen, extern int packfrm(const uchar *, size_t, uchar **, size_t *); extern int unpackfrm(uchar **, size_t *, const uchar *); -void my_checksum_init(void); -#ifdef HAVE_CRC32_VPMSUM -extern ha_checksum my_checksum(ha_checksum, const void *, size_t); -#else -typedef ha_checksum (*my_crc32_t)(ha_checksum, const void *, size_t); -extern MYSQL_PLUGIN_IMPORT my_crc32_t my_checksum; -#endif +extern uint32 my_checksum(uint32, const void *, size_t); +extern uint32 my_crc32c(uint32, const void *, size_t); -#if defined(__GNUC__) && defined(HAVE_ARMV8_CRC) -int crc32_aarch64_available(void); -const char *crc32c_aarch64_available(void); -#endif +extern const char *my_crc32c_implementation(); #ifdef DBUG_ASSERT_EXISTS extern void my_debug_put_break_here(void); |