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 /storage/spider/ha_spider.cc | |
| 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 'storage/spider/ha_spider.cc')
| -rw-r--r-- | storage/spider/ha_spider.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 134ae372c8a..9b871f59a38 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -4393,12 +4393,12 @@ int ha_spider::read_multi_range_first_internal( #ifdef HA_MRR_USE_DEFAULT_IMPL (error_num = spider_db_append_key_where( &mrr_cur_range.start_key, - test(mrr_cur_range.range_flag & EQ_RANGE) ? + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ? NULL : &mrr_cur_range.end_key, this)) #else (error_num = spider_db_append_key_where( &multi_range_curr->start_key, - test(multi_range_curr->range_flag & EQ_RANGE) ? + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ? NULL : &multi_range_curr->end_key, this)) #endif ) @@ -4834,9 +4834,9 @@ int ha_spider::read_multi_range_first_internal( !(sql_kinds & SPIDER_SQL_KIND_HS) && #endif #ifdef HA_MRR_USE_DEFAULT_IMPL - test(mrr_cur_range.range_flag & EQ_RANGE) + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) #else - test(multi_range_curr->range_flag & EQ_RANGE) + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) #endif ) { if ( @@ -4951,11 +4951,11 @@ int ha_spider::read_multi_range_first_internal( { if ( #ifdef HA_MRR_USE_DEFAULT_IMPL - !test(mrr_cur_range.range_flag & EQ_RANGE) || + !MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) || result_list.tmp_table_join_key_part_map != mrr_cur_range.start_key.keypart_map #else - !test(multi_range_curr->range_flag & EQ_RANGE) || + !MY_TEST(multi_range_curr->range_flag & EQ_RANGE) || result_list.tmp_table_join_key_part_map != multi_range_curr->start_key.keypart_map #endif @@ -5119,12 +5119,12 @@ int ha_spider::read_multi_range_first_internal( #ifdef HA_MRR_USE_DEFAULT_IMPL (error_num = spider_db_append_key_where( &mrr_cur_range.start_key, - test(mrr_cur_range.range_flag & EQ_RANGE) ? + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ? NULL : &mrr_cur_range.end_key, this)) #else (error_num = spider_db_append_key_where( &multi_range_curr->start_key, - test(multi_range_curr->range_flag & EQ_RANGE) ? + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ? NULL : &multi_range_curr->end_key, this)) #endif ) @@ -5739,12 +5739,12 @@ int ha_spider::read_multi_range_next( #ifdef HA_MRR_USE_DEFAULT_IMPL (error_num = spider_db_append_key_where( &mrr_cur_range.start_key, - test(mrr_cur_range.range_flag & EQ_RANGE) ? + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ? NULL : &mrr_cur_range.end_key, this)) #else (error_num = spider_db_append_key_where( &multi_range_curr->start_key, - test(multi_range_curr->range_flag & EQ_RANGE) ? + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ? NULL : &multi_range_curr->end_key, this)) #endif ) @@ -6193,9 +6193,9 @@ int ha_spider::read_multi_range_next( !(sql_kinds & SPIDER_SQL_KIND_HS) && #endif #ifdef HA_MRR_USE_DEFAULT_IMPL - test(mrr_cur_range.range_flag & EQ_RANGE) + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) #else - test(multi_range_curr->range_flag & EQ_RANGE) + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) #endif ) { if ( @@ -6311,11 +6311,11 @@ int ha_spider::read_multi_range_next( { if ( #ifdef HA_MRR_USE_DEFAULT_IMPL - !test(mrr_cur_range.range_flag & EQ_RANGE) || + !MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) || result_list.tmp_table_join_key_part_map != mrr_cur_range.start_key.keypart_map #else - !test(multi_range_curr->range_flag & EQ_RANGE) || + !MY_TEST(multi_range_curr->range_flag & EQ_RANGE) || result_list.tmp_table_join_key_part_map != multi_range_curr->start_key.keypart_map #endif @@ -6478,12 +6478,12 @@ int ha_spider::read_multi_range_next( #ifdef HA_MRR_USE_DEFAULT_IMPL (error_num = spider_db_append_key_where( &mrr_cur_range.start_key, - test(mrr_cur_range.range_flag & EQ_RANGE) ? + MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ? NULL : &mrr_cur_range.end_key, this)) #else (error_num = spider_db_append_key_where( &multi_range_curr->start_key, - test(multi_range_curr->range_flag & EQ_RANGE) ? + MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ? NULL : &multi_range_curr->end_key, this)) #endif ) |