diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 12:31:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 12:31:56 +0300 |
| commit | ef44ec4afaa70521789dbb7886a0a21da64a569e (patch) | |
| tree | 1862c6cd81a3a39780ef1f31b417dcdba2ba7bd4 /storage/maria | |
| parent | 7e4ea4189ae993460a31431816e36db78fa63a67 (diff) | |
| parent | d9dcb8ba029709cf447efd9237f6ad4834f0783a (diff) | |
| download | mariadb-git-ef44ec4afaa70521789dbb7886a0a21da64a569e.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ha_maria.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 7e71b361d6e..025477366a5 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -355,10 +355,12 @@ static PSI_file_info all_aria_files[]= { &key_file_control, "control", PSI_FLAG_GLOBAL} }; +# ifdef HAVE_PSI_STAGE_INTERFACE static PSI_stage_info *all_aria_stages[]= { & stage_waiting_for_a_resource }; +# endif /* HAVE_PSI_STAGE_INTERFACE */ static void init_aria_psi_keys(void) { @@ -379,9 +381,10 @@ static void init_aria_psi_keys(void) count= array_elements(all_aria_files); mysql_file_register(category, all_aria_files, count); - +# ifdef HAVE_PSI_STAGE_INTERFACE count= array_elements(all_aria_stages); mysql_stage_register(category, all_aria_stages, count); +# endif /* HAVE_PSI_STAGE_INTERFACE */ } #else #define init_aria_psi_keys() /* no-op */ |