mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge Spider 3.2.18
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user