diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 100fe922825..404d3b6754e 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -1095,7 +1095,7 @@ SPIDER_CONN *spider_get_conn( } else - { /* did not enable conncetion pool , create_conn */ + { /* did not enable conncetion pool , create_conn */ DBUG_PRINT("info",("spider create new conn")); if (!(conn = spider_create_conn(share, spider, link_idx, base_link_idx, conn_kind, error_num))) diff --git a/storage/spider/spd_environ.h b/storage/spider/spd_environ.h index 528bed160c9..320b0edeb30 100644 --- a/storage/spider/spd_environ.h +++ b/storage/spider/spd_environ.h @@ -24,12 +24,12 @@ #define SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100100 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100100 #define SPIDER_SUPPORT_CREATE_OR_REPLACE_TABLE #define SPIDER_NET_HAS_THD #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100211 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100211 #define HANDLER_HAS_TOP_TABLE_FIELDS #define HANDLER_HAS_DIRECT_UPDATE_ROWS #define HANDLER_HAS_DIRECT_AGGREGATE @@ -40,22 +40,22 @@ #define HANDLER_HAS_CAN_USE_FOR_AUTO_INC_INIT #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100300 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100300 #define SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100309 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100309 #define SPIDER_MDEV_16246 #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100400 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100400 #define SPIDER_USE_CONST_ITEM_FOR_STRING_INT_REAL_DECIMAL_DATE_ITEM #define SPIDER_SQL_CACHE_IS_IN_LEX #define SPIDER_LIKE_FUNC_HAS_GET_NEGATED #define HA_HAS_CHECKSUM_EXTENDED #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100500 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100500 #define SPIDER_I_S_USE_SHOW_FOR_COLUMN #endif #endif /* SPD_ENVIRON_INCLUDED */ diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 31c75b68d6e..343e90e75b6 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -228,7 +228,7 @@ const char SPIDER_empty_string = ""; #define SPIDER_HAS_HASH_VALUE_TYPE #endif -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100400 +#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100400 #define SPIDER_date_mode_t(A) date_mode_t(A) #define SPIDER_str_to_datetime(A,B,C,D,E) str_to_datetime_or_date(A,B,C,D,E) #define SPIDER_get_linkage(A) A->get_linkage() diff --git a/storage/spider/spd_table.h b/storage/spider/spd_table.h index c57f4e4d4c0..c3f1dc09db5 100644 --- a/storage/spider/spd_table.h +++ b/storage/spider/spd_table.h @@ -738,8 +738,8 @@ Field *spider_field_exchange( #endif int spider_set_direct_limit_offset( - ha_spider* spider - ); + ha_spider *spider +); bool spider_check_index_merge( TABLE *table,