mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

temporary reverting for merging Spider

Browse source
This commit is contained in:
Kentoku SHIBA 2014-03-25 04:09:43 +09:00
commit 954e650356
5 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
storage/spider/ha_spider.cc
View file

@ -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,
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
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,
MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
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
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE)
test(mrr_cur_range.range_flag & EQ_RANGE)
#else
MY_TEST(multi_range_curr->range_flag & EQ_RANGE)
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
!MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ||
!test(mrr_cur_range.range_flag & EQ_RANGE) ||
result_list.tmp_table_join_key_part_map !=
mrr_cur_range.start_key.keypart_map
#else
!MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ||
!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,
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
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,
MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
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,
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
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,
MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
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
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE)
test(mrr_cur_range.range_flag & EQ_RANGE)
#else
MY_TEST(multi_range_curr->range_flag & EQ_RANGE)
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
!MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ||
!test(mrr_cur_range.range_flag & EQ_RANGE) ||
result_list.tmp_table_join_key_part_map !=
mrr_cur_range.start_key.keypart_map
#else
!MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ||
!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,
MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
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,
MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
test(multi_range_curr->range_flag & EQ_RANGE) ?
NULL : &multi_range_curr->end_key, this))
#endif
)