diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-15 18:25:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
| commit | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (patch) | |
| tree | f8f9cab2cd92e43b5fd20c9ac77f9487ece4e5a7 /storage/mroonga | |
| parent | 81cffda2e68ea5a155b74f24ae4345388afa963c (diff) | |
| download | mariadb-git-7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359.tar.gz | |
perfschema compilation, test and misc fixes
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/ha_mroonga.cpp | 2 | ||||
| -rw-r--r-- | storage/mroonga/mrn_mysql_compat.h | 11 | ||||
| -rw-r--r-- | storage/mroonga/mrn_variables.hpp | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index 0d0ee3aab9d..5cdf062922b 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -228,9 +228,9 @@ Time_zone *mrn_my_tz_UTC; HASH *mrn_table_def_cache; #endif -#ifdef MRN_HAVE_PSI_MEMORY_KEY PSI_memory_key mrn_memory_key; +#ifdef MRN_HAVE_PSI_MEMORY_KEY static PSI_memory_info mrn_all_memory_keys[]= { {&mrn_memory_key, "Mroonga", 0} diff --git a/storage/mroonga/mrn_mysql_compat.h b/storage/mroonga/mrn_mysql_compat.h index a90b1a169e9..e1b6416874c 100644 --- a/storage/mroonga/mrn_mysql_compat.h +++ b/storage/mroonga/mrn_mysql_compat.h @@ -133,9 +133,10 @@ # define MRN_SEVERITY_WARNING Sql_condition::WARN_LEVEL_WARN #endif +#ifdef HAVE_PSI_MEMORY_INTERFACE #define MRN_HAVE_PSI_MEMORY_KEY +#endif -#ifdef MRN_HAVE_PSI_MEMORY_KEY # define mrn_my_malloc(size, flags) \ my_malloc(mrn_memory_key, size, flags) # define mrn_my_strdup(string, flags) \ @@ -144,14 +145,6 @@ my_strndup(mrn_memory_key, string, size, flags) # define mrn_my_multi_malloc(flags, ...) \ my_multi_malloc(mrn_memory_key, flags, __VA_ARGS__) -#else -# define mrn_my_malloc(size, flags) my_malloc(size, flags) -# define mrn_my_strdup(string, flags) my_strdup(string, flags) -# define mrn_my_strndup(string, size, flags) \ - my_strndup(string, size, flags) -# define mrn_my_multi_malloc(flags, ...) \ - my_multi_malloc(flags, __VA_ARGS__) -#endif #if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P) # define MRN_STRING_FREE(string) string.mem_free(); diff --git a/storage/mroonga/mrn_variables.hpp b/storage/mroonga/mrn_variables.hpp index f55b1fd35a0..8a0113c5e14 100644 --- a/storage/mroonga/mrn_variables.hpp +++ b/storage/mroonga/mrn_variables.hpp @@ -22,9 +22,7 @@ #include "mrn_mysql_compat.h" -#ifdef MRN_HAVE_PSI_MEMORY_KEY extern PSI_memory_key mrn_memory_key; -#endif namespace mrn { namespace variables { |