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++. --- sql/sql_statistics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_statistics.h') diff --git a/sql/sql_statistics.h b/sql/sql_statistics.h index c1c80921861..68aacd69d98 100644 --- a/sql/sql_statistics.h +++ b/sql/sql_statistics.h @@ -354,7 +354,7 @@ public: bool is_null(uint stat_field_no) { - return test(column_stat_nulls & (1 << stat_field_no)); + return MY_TEST(column_stat_nulls & (1 << stat_field_no)); } double get_nulls_ratio() -- cgit v1.2.1