diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
| commit | 81c13acfb3585baf435eb37955561053f02e12bb (patch) | |
| tree | 74d838b5d1011187705f4801db033118fd41537c /include | |
| parent | d40d3f4e57f375897aa29e72e947e372e6bc229d (diff) | |
| parent | 0da39caceea7733a94d898427d63ba2670160af4 (diff) | |
| download | mariadb-git-81c13acfb3585baf435eb37955561053f02e12bb.tar.gz | |
Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52
Diffstat (limited to 'include')
| -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 7e37fe598bd..001769a0b76 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 @@ -246,7 +246,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; /* from default.c */ |