diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 23:19:51 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 23:19:51 +0200 |
| commit | ae6bdc6769646a09a8d4d08a42a69174ea677768 (patch) | |
| tree | c80afdd0e3238dc5092fdcb1439f1390f9a9040b /include/my_sys.h | |
| parent | a49f5525bbe1bb1f4320bd0db066068a81af62d9 (diff) | |
| parent | 7841a7eb09208f52fcbab7e80e38c7ca29b1339e (diff) | |
| download | mariadb-git-ae6bdc6769646a09a8d4d08a42a69174ea677768.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index f76d1f463a7..1304dee0146 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2020, MariaDB Corporation. + Copyright (c) 2010, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -266,7 +266,8 @@ extern int my_umask_dir, 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; |