From d12c7adf715677b118104d4e5adf6f978c27b4ee Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 19 Feb 2014 14:05:15 +0400 Subject: 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 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++. --- mysys/mf_keycache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysys/mf_keycache.c') diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 1ee71e55b68..b45b631283a 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -5651,7 +5651,7 @@ int flush_partitioned_key_cache_blocks(PARTITIONED_KEY_CACHE_CB *keycache, if ((type == FLUSH_KEEP || type == FLUSH_FORCE_WRITE) && !((*dirty_part_map) & ((ulonglong) 1 << i))) continue; - err|= test(flush_simple_key_cache_blocks(partition, file, 0, type)); + err|= MY_TEST(flush_simple_key_cache_blocks(partition, file, 0, type)); } *dirty_part_map= 0; -- cgit v1.2.1