diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
| commit | 496d0372ef2ff2a570c20923af4df32a03781acd (patch) | |
| tree | c15d45eeff0fbbfe6112816a72e10352551269ee /storage/maria/ha_maria.cc | |
| parent | d4da131cff004e4157b755e417c49daef45ca80e (diff) | |
| parent | 5ba2aa1ddc074dc89db7f265ddb61ce96f714fc8 (diff) | |
| download | mariadb-git-496d0372ef2ff2a570c20923af4df32a03781acd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/maria/ha_maria.cc')
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index c5d280ddc72..c15469ecb75 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -297,7 +297,7 @@ static MYSQL_SYSVAR_BOOL(encrypt_tables, maria_encrypt_tables, PLUGIN_VAR_OPCMDA "and not FIXED/DYNAMIC)", 0, 0, 0); -#ifdef HAVE_PSI_INTERFACE +#if defined HAVE_PSI_INTERFACE && !defined EMBEDDED_LIBRARY static PSI_mutex_info all_aria_mutexes[]= { |