diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-06-14 11:46:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-07-04 01:44:46 +0200 |
| commit | d2b852b4ca326f2a47ba1f51cd27e04a9954aa0d (patch) | |
| tree | de9e9d52dc03343a17150c008fe8797dc213dbe6 /storage/myisam | |
| parent | 7d75e4326170ab3b22de0365b4b093ea6bc24285 (diff) | |
| download | mariadb-git-d2b852b4ca326f2a47ba1f51cd27e04a9954aa0d.tar.gz | |
cleanup, less #ifdef's
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | storage/myisam/myisamdef.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 448aab0a092..e7ca765351b 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2516,9 +2516,7 @@ static int myisam_init(void *p) { handlerton *hton; -#ifdef HAVE_PSI_INTERFACE init_myisam_psi_keys(); -#endif /* Set global variables based on startup options */ if (myisam_recover_options && myisam_recover_options != HA_RECOVER_OFF) diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 640a04fb3df..f48d1078000 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -774,6 +774,8 @@ extern PSI_file_key mi_key_file_datatmp, mi_key_file_dfile, mi_key_file_kfile, extern PSI_thread_key mi_key_thread_find_all_keys; void init_myisam_psi_keys(); +#else +#define init_myisam_psi_keys() do { } while(0) #endif /* HAVE_PSI_INTERFACE */ extern PSI_memory_key mi_key_memory_MYISAM_SHARE; |