diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
| commit | 9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35 (patch) | |
| tree | 68f8e54f6c2484dc7791bee8c594d3d07c611d29 /include/my_sys.h | |
| parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| download | mariadb-git-9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 7cd417fd9cb..9e26aa4f8f4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -915,6 +915,9 @@ extern MYSQL_PLUGIN_IMPORT my_crc32_t my_checksum; #if defined(__GNUC__) && defined(HAVE_ARMV8_CRC) int crc32_aarch64_available(void); +#if defined(HAVE_ARMV8_CRYPTO) +int crc32c_aarch64_available(void); +#endif #endif #ifdef DBUG_ASSERT_EXISTS @@ -1053,9 +1056,13 @@ extern my_bool resolve_collation(const char *cl_name, CHARSET_INFO **cl); extern void free_charsets(void); extern char *get_charsets_dir(char *buf); -extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); +static inline my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2) +{ + return (cs1->csname == cs2->csname); +} extern my_bool init_compiled_charsets(myf flags); extern void add_compiled_collation(struct charset_info_st *cs); +extern void add_compiled_extra_collation(struct charset_info_st *cs); extern size_t escape_string_for_mysql(CHARSET_INFO *charset_info, char *to, size_t to_length, const char *from, size_t length); |