diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
commit | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (patch) | |
tree | 96dad57dc1b9946a3cbec98473b3ec2534a455f2 /include/my_sys.h | |
parent | a53f3c6d3cfa50b15b1aff26bc9479eb582d8611 (diff) | |
parent | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (diff) | |
download | mariadb-git-23af6f5942e7235a7c14a36cb8dd0d2796b5ef37.tar.gz |
Merge branch '10.0' of github.com:MariaDB/server into 10.0
Diffstat (limited to 'include/my_sys.h')
-rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index a0b7f4cc554..f6bf57e50a4 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, 2013, Monty Program Ab. + Copyright (c) 2010, 2016, Monty Program Ab. 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 @@ -271,7 +271,7 @@ extern my_bool my_use_symdir; extern ulong my_default_record_cache_size; extern my_bool my_disable_locking, my_disable_async_io, my_disable_flush_key_blocks, my_disable_symlinks; -extern my_bool my_disable_sync; +extern my_bool my_disable_sync, my_disable_copystat_in_redel; extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern my_bool timed_mutexes; |