diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-02-20 00:41:26 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-02-20 00:41:26 +0900 |
| commit | cf3b51b1d54f2daf7ca5dc6891be2832d8e9d3a1 (patch) | |
| tree | d8678c1aa3505c48719d4530fd89223ecf219a99 /storage/spider/spd_db_include.h | |
| parent | 865b83e9a4b834b1f58e60db4709031bef823f4a (diff) | |
| download | mariadb-git-cf3b51b1d54f2daf7ca5dc6891be2832d8e9d3a1.tar.gz | |
Merge Spider 3.2.18
Diffstat (limited to 'storage/spider/spd_db_include.h')
| -rw-r--r-- | storage/spider/spd_db_include.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h index 371257a955b..c70995ec007 100644 --- a/storage/spider/spd_db_include.h +++ b/storage/spider/spd_db_include.h @@ -24,6 +24,9 @@ #define SPIDER_HAS_DISCOVER_TABLE_STRUCTURE #define SPIDER_HAS_APPEND_FOR_SINGLE_QUOTE #define SPIDER_HAS_SHOW_SIMPLE_FUNC +#define SPIDER_HAS_JT_HASH_INDEX_MERGE +#else +#define SPIDER_NEED_CHECK_CONDITION_AT_CHECKING_DIRECT_ORDER_LIMIT #endif #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100007 @@ -36,8 +39,13 @@ #define SPIDER_HAS_DECIMAL_OPERATION_RESULTS_VALUE_TYPE #endif +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100014 +#define SPIDER_ITEM_STRING_WITHOUT_SET_STR_WITH_COPY +#endif + #if defined(MARIADB_BASE_VERSION) #define SPIDER_ITEM_GEOFUNC_NAME_HAS_MBR +#define SPIDER_HANDLER_AUTO_REPAIR_HAS_ERROR #endif class spider_db_conn; @@ -1649,6 +1657,7 @@ typedef struct st_spider_result_list bool snap_direct_aggregate; SPIDER_DB_ROW *snap_row; #endif + bool in_cmp_ref; bool set_split_read; bool insert_dup_update_pushdown; longlong split_read_base; |