diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
| commit | 77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch) | |
| tree | 5dcd215abf7afd125ad5744697565121b954c1b2 /include | |
| parent | 677c44f0c37973ad70550d9b807781e688764fae (diff) | |
| parent | d61e5260fb9983ea8dff539b23a6d0a150c2065c (diff) | |
| download | mariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 4c58c21b2aa..007c9400ec0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -882,8 +882,7 @@ typedef long long my_ptrdiff_t; and related routines are refactored. */ -#define my_offsetof(TYPE, MEMBER) \ - ((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10)) +#define my_offsetof(TYPE, MEMBER) PTR_BYTE_DIFF(&((TYPE *)0x10)->MEMBER, 0x10) #define NullS (char *) 0 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; |