diff options
author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-01-15 17:28:06 +0900 |
---|---|---|
committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-01-15 17:33:48 +0900 |
commit | 64f844b611d38f05303a88e4ab0aaa37062233b8 (patch) | |
tree | 827e37b6e26f74c9e48bdcb3a45712ad719fe66b | |
parent | 2ecd39c983a232289b863ba2c7bf8f70ebaa261f (diff) | |
download | mariadb-git-64f844b611d38f05303a88e4ab0aaa37062233b8.tar.gz |
MDEV-27240 fixup: remove #ifdef in macro call
Windows builds failed due to the following error:
'#': invalid character: possibly the result of a macro expansion
-rw-r--r-- | storage/spider/ha_spider.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 64d54fbaf9b..1de57156dcf 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -375,6 +375,7 @@ int ha_spider::open( uchar *rnd_read_bitmap; uchar *rnd_write_bitmap; if (!(wide_handler = (SPIDER_WIDE_HANDLER *) +#ifdef WITH_PARTITION_STORAGE_ENGINE spider_bulk_malloc(spider_current_trx, 16, MYF(MY_WME | MY_ZEROFILL), &wide_handler, sizeof(SPIDER_WIDE_HANDLER), &searched_bitmap, @@ -391,11 +392,29 @@ int ha_spider::open( (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), &rnd_write_bitmap, (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), -#ifdef WITH_PARTITION_STORAGE_ENGINE &partition_handler, (uint) sizeof(SPIDER_PARTITION_HANDLER), + NullS) +#else + spider_bulk_malloc(spider_current_trx, 16, MYF(MY_WME | MY_ZEROFILL), + &wide_handler, sizeof(SPIDER_WIDE_HANDLER), + &searched_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &ft_discard_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &position_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &idx_read_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &idx_write_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &rnd_read_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + &rnd_write_bitmap, + (uint) sizeof(uchar) * no_bytes_in_map(table->read_set), + NullS) #endif - NullS)) + ) ) { error_num = HA_ERR_OUT_OF_MEM; goto error_wide_handler_alloc; |