diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-04 11:52:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-04 11:52:39 +0300 |
commit | ddcb242b3cd2e95bcf4c950bffaafc0775db45ee (patch) | |
tree | 1530aecf970c187d377fce3901c889ef6c8b2995 /include/my_sys.h | |
parent | c5ae2c4971127290335588c7498f24d10f32e204 (diff) | |
parent | 2db692f5b4d6bb31a331dab44544171c455f6aca (diff) | |
download | mariadb-git-ddcb242b3cd2e95bcf4c950bffaafc0775db45ee.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'include/my_sys.h')
-rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b1f7c322360..dae4777db11 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -279,7 +279,8 @@ LPSECURITY_ATTRIBUTES my_win_file_secattr(); extern my_bool my_use_symdir; extern ulong my_default_record_cache_size; -extern my_bool my_disable_locking, my_disable_async_io, +extern MYSQL_PLUGIN_IMPORT my_bool my_disable_locking; +extern my_bool my_disable_async_io, my_disable_flush_key_blocks, my_disable_symlinks; extern my_bool my_disable_sync, my_disable_copystat_in_redel; extern char wild_many,wild_one,wild_prefix; |