diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2014-02-19 14:05:15 +0400 |
| commit | d12c7adf715677b118104d4e5adf6f978c27b4ee (patch) | |
| tree | 04cdbaf4509cbe485cb992e271ab8d711a867011 /mysys/tree.c | |
| parent | fd1437dfe532ed78ce2a1c8e05a989fcbf79832e (diff) | |
| download | mariadb-git-d12c7adf715677b118104d4e5adf6f978c27b4ee.tar.gz | |
MDEV-5314 - Compiling fails on OSX using clang
This is port of fix for MySQL BUG#17647863.
revno: 5572
revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
timestamp: Thu 2013-10-31 00:22:43 +0100
message:
Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM
Rename test() macro to MY_TEST() to avoid conflict with libc++.
Diffstat (limited to 'mysys/tree.c')
| -rw-r--r-- | mysys/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/tree.c b/mysys/tree.c index fe2d3f45d57..a9fc542faf6 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -127,7 +127,7 @@ void init_tree(TREE *tree, size_t default_alloc_size, size_t memory_limit, tree->offset_to_key=0; /* use key through pointer */ tree->size_of_element+=sizeof(void*); } - if (!(tree->with_delete= test(my_flags & MY_TREE_WITH_DELETE))) + if (!(tree->with_delete= MY_TEST(my_flags & MY_TREE_WITH_DELETE))) { init_alloc_root(&tree->mem_root, default_alloc_size, 0, MYF(my_flags)); tree->mem_root.min_malloc= sizeof(TREE_ELEMENT)+tree->size_of_element; |