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_include.h | |
| parent | 865b83e9a4b834b1f58e60db4709031bef823f4a (diff) | |
| download | mariadb-git-cf3b51b1d54f2daf7ca5dc6891be2832d8e9d3a1.tar.gz | |
Merge Spider 3.2.18
Diffstat (limited to 'storage/spider/spd_include.h')
| -rw-r--r-- | storage/spider/spd_include.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index f6952e5398e..9c7eebb65c8 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define SPIDER_DETAIL_VERSION "3.2.11" +#define SPIDER_DETAIL_VERSION "3.2.18" #define SPIDER_HEX_VERSION 0x0302 #if MYSQL_VERSION_ID < 50500 @@ -70,6 +70,7 @@ #define spider_stmt_da_message(A) thd_get_error_message(A) #define spider_stmt_da_sql_errno(A) thd_get_error_number(A) #define spider_user_defined_key_parts(A) (A)->user_defined_key_parts +#define spider_join_table_count(A) (A)->table_count #define SPIDER_CAN_BG_UPDATE (1LL << 39) #define SPIDER_ALTER_ADD_PARTITION Alter_info::ALTER_ADD_PARTITION #define SPIDER_ALTER_DROP_PARTITION Alter_info::ALTER_DROP_PARTITION @@ -94,6 +95,7 @@ #endif #endif #define spider_user_defined_key_parts(A) (A)->key_parts +#define spider_join_table_count(A) (A)->tables #define SPIDER_ALTER_ADD_PARTITION ALTER_ADD_PARTITION #define SPIDER_ALTER_DROP_PARTITION ALTER_DROP_PARTITION #define SPIDER_ALTER_COALESCE_PARTITION ALTER_COALESCE_PARTITION @@ -105,6 +107,10 @@ #define SPIDER_THD_KILL_CONNECTION THD::KILL_CONNECTION #endif +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100005 +#define SPIDER_HAS_EXPLAIN_QUERY +#endif + #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100009 #define SPIDER_TEST(A) MY_TEST(A) #else |