summaryrefslogtreecommitdiff
path: root/storage/spider/ha_spider.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-09-09 16:20:55 +0300
committerMonty <monty@mariadb.org>2017-12-03 13:58:35 +0200
commitda26d16dd1c07b34f46ba4b00527ebf76810d57d (patch)
tree387112d3d377201a9465b24e9dfa68d5f9340f31 /storage/spider/ha_spider.h
parent6f5a7e9227252512ecf2178b6d56c46318aef7d7 (diff)
downloadmariadb-git-da26d16dd1c07b34f46ba4b00527ebf76810d57d.tar.gz
Add direct aggregates
Spider patches 026 (MDEV-7723), 031 (MDEV-7727) and 058 (MDEV-12532) This allows the storage engine to internally compute sum and count operations. - Enhance sum items to be able to store the sum value directly. - return_record_by_parent() is enabled in spider as HANDLER_HAS_DIRECT_AGGREGATE is defined - Added spd_environ.h to spider. This is loaded first to ensure that all MariaDB specific defines that are used by include files are properly defined. - This code is tested by the existing spider tests direct_aggregate.test and direct_aggregate_part.test and also partition.test
Diffstat (limited to 'storage/spider/ha_spider.h')
-rw-r--r--storage/spider/ha_spider.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h
index 4903c8a25fe..a28d98264dc 100644
--- a/storage/spider/ha_spider.h
+++ b/storage/spider/ha_spider.h
@@ -17,18 +17,7 @@
#pragma interface
#endif
-#if (defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100000)
-#define SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS
-#endif
-
-#if MYSQL_VERSION_ID >= 100203
-#define HANDLER_HAS_TOP_TABLE_FIELDS
-#define PARTITION_HAS_EXTRA_ATTACH_CHILDREN
-#define PARTITION_HAS_GET_CHILD_HANDLERS
-#define PARTITION_HAS_EXTRA_ATTACH_CHILDREN
-#define PARTITION_HAS_GET_CHILD_HANDLERS
-#define HA_EXTRA_HAS_STARTING_ORDERED_INDEX_SCAN
-#endif
+#include "spd_environ.h"
#define SPIDER_CONNECT_INFO_MAX_LEN 64
#define SPIDER_CONNECT_INFO_PATH_MAX_LEN FN_REFLEN