MDEV-27811: remove SPIDER_MDEV_16246

MDEV-16246 was fixed long ago. And this macro was removed in other
versions too

storage/spider/ha_spider.cc

@@ -9413,7 +9413,6 @@ bool ha_spider::check_direct_update_sql_part(
 }
 
 #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS_WITH_HS
-#ifdef SPIDER_MDEV_16246
 int ha_spider::direct_update_rows_init(
   List<Item> *update_fields,
   uint mode,
@@ -9422,15 +9421,6 @@ int ha_spider::direct_update_rows_init(
   bool sorted,
   uchar *new_data
 )
-#else
-int ha_spider::direct_update_rows_init(
-  uint mode,
-  KEY_MULTI_RANGE *ranges,
-  uint range_count,
-  bool sorted,
-  uchar *new_data
-)
-#endif
 {
   st_select_lex *select_lex;
   longlong select_limit;
@@ -9455,13 +9445,8 @@ int ha_spider::direct_update_rows_init(
         pre_direct_init_result));
       DBUG_RETURN(pre_direct_init_result);
     }
-#ifdef SPIDER_MDEV_16246
     DBUG_RETURN(bulk_access_link_exec_tgt->spider->direct_update_rows_init(
       update_fields, mode, ranges, range_count, sorted, new_data));
-#else
-    DBUG_RETURN(bulk_access_link_exec_tgt->spider->direct_update_rows_init(
-      mode, ranges, range_count, sorted, new_data));
-#endif
   }
 #endif
   if (!dml_inited)
@@ -9538,7 +9523,6 @@ int ha_spider::direct_update_rows_init(
   DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 }
 #else
-#ifdef SPIDER_MDEV_16246
 /**
   Perform initialization for a direct update request.
 
@@ -9551,9 +9535,6 @@ int ha_spider::direct_update_rows_init(
 int ha_spider::direct_update_rows_init(
   List<Item> *update_fields
 )
-#else
-int ha_spider::direct_update_rows_init()
-#endif
 {
   st_select_lex *select_lex;
   longlong select_limit;
@@ -9602,12 +9583,8 @@ int ha_spider::direct_update_rows_init()
         pre_direct_init_result));
       DBUG_RETURN(pre_direct_init_result);
     }
-#ifdef SPIDER_MDEV_16246
     DBUG_RETURN(bulk_access_link_exec_tgt->spider->
       direct_update_rows_init(update_fields));
-#else
-    DBUG_RETURN(bulk_access_link_exec_tgt->spider->direct_update_rows_init());
-#endif
   }
 #endif
   if (!dml_inited)
@@ -9682,7 +9659,6 @@ int ha_spider::direct_update_rows_init()
 
 #ifdef HA_CAN_BULK_ACCESS
 #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS_WITH_HS
-#ifdef SPIDER_MDEV_16246
 int ha_spider::pre_direct_update_rows_init(
   List<Item> *update_fields,
   uint mode,
@@ -9691,30 +9667,15 @@ int ha_spider::pre_direct_update_rows_init(
   bool sorted,
   uchar *new_data
 )
-#else
-int ha_spider::pre_direct_update_rows_init(
-  uint mode,
-  KEY_MULTI_RANGE *ranges,
-  uint range_count,
-  bool sorted,
-  uchar *new_data
-)
-#endif
 {
   int error_num;
   DBUG_ENTER("ha_spider::pre_direct_update_rows_init");
   DBUG_PRINT("info",("spider this=%p", this));
   if (bulk_access_started)
   {
-#ifdef SPIDER_MDEV_16246
     error_num = bulk_access_link_current->spider->
       pre_direct_update_rows_init(
       update_fields, mode, ranges, range_count, sorted, new_data);
-#else
-    error_num = bulk_access_link_current->spider->
-      pre_direct_update_rows_init(
-      mode, ranges, range_count, sorted, new_data);
-#endif
     bulk_access_link_current->spider->bulk_access_pre_called = TRUE;
     bulk_access_link_current->called = TRUE;
     DBUG_RETURN(error_num);
@@ -9726,17 +9687,11 @@ int ha_spider::pre_direct_update_rows_init(
       DBUG_RETURN(error_num);
     }
   }
-#ifdef SPIDER_MDEV_16246
   pre_direct_init_result = direct_update_rows_init(
     update_fields, mode, ranges, range_count, sorted, new_data);
-#else
-  pre_direct_init_result = direct_update_rows_init(
-    mode, ranges, range_count, sorted, new_data);
-#endif
   DBUG_RETURN(pre_direct_init_result);
 }
 #else
-#ifdef SPIDER_MDEV_16246
 /**
   Do initialization for performing parallel direct update
   for a handlersocket update request.
@@ -9750,22 +9705,14 @@ int ha_spider::pre_direct_update_rows_init(
 int ha_spider::pre_direct_update_rows_init(
   List<Item> *update_fields
 )
-#else
-int ha_spider::pre_direct_update_rows_init()
-#endif
 {
   int error_num;
   DBUG_ENTER("ha_spider::pre_direct_update_rows_init");
   DBUG_PRINT("info",("spider this=%p", this));
   if (bulk_access_started)
   {
-#ifdef SPIDER_MDEV_16246
     error_num = bulk_access_link_current->spider->
       pre_direct_update_rows_init(update_fields);
-#else
-    error_num = bulk_access_link_current->spider->
-      pre_direct_update_rows_init();
-#endif
     bulk_access_link_current->spider->bulk_access_pre_called = TRUE;
     bulk_access_link_current->called = TRUE;
     DBUG_RETURN(error_num);
@@ -9777,11 +9724,7 @@ int ha_spider::pre_direct_update_rows_init()
       DBUG_RETURN(error_num);
     }
   }
-#ifdef SPIDER_MDEV_16246
   pre_direct_init_result = direct_update_rows_init(update_fields);
-#else
-  pre_direct_init_result = direct_update_rows_init();
-#endif
   DBUG_RETURN(pre_direct_init_result);
 }
 #endif

storage/spider/ha_spider.h

@@ -502,7 +502,6 @@ class ha_spider final : public handler
     longlong offset_limit
   );
 #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS_WITH_HS
-#ifdef SPIDER_MDEV_16246
   inline int direct_update_rows_init(
     List<Item> *update_fields
   ) {
@@ -517,30 +516,12 @@ class ha_spider final : public handler
     uchar *new_data
   );
 #else
-  inline int direct_update_rows_init()
-  {
-    return direct_update_rows_init(2, NULL, 0, FALSE, NULL);
-  }
-  int direct_update_rows_init(
-    uint mode,
-    KEY_MULTI_RANGE *ranges,
-    uint range_count,
-    bool sorted,
-    uchar *new_data
-  );
-#endif
-#else
-#ifdef SPIDER_MDEV_16246
   int direct_update_rows_init(
     List<Item> *update_fields
   ) override;
-#else
-  int direct_update_rows_init();
-#endif
 #endif
 #ifdef HA_CAN_BULK_ACCESS
 #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS_WITH_HS
-#ifdef SPIDER_MDEV_16246
   inline int pre_direct_update_rows_init(
     List<Item> *update_fields
   ) {
@@ -555,26 +536,9 @@ class ha_spider final : public handler
     uchar *new_data
   );
 #else
-  inline int pre_direct_update_rows_init()
-  {
-    return pre_direct_update_rows_init(2, NULL, 0, FALSE, NULL);
-  }
-  int pre_direct_update_rows_init(
-    uint mode,
-    KEY_MULTI_RANGE *ranges,
-    uint range_count,
-    bool sorted,
-    uchar *new_data
-  );
-#endif
-#else
-#ifdef SPIDER_MDEV_16246
   int pre_direct_update_rows_init(
     List<Item> *update_fields
   );
-#else
-  int pre_direct_update_rows_init();
-#endif
 #endif
 #endif
 #ifdef HANDLER_HAS_DIRECT_UPDATE_ROWS_WITH_HS

storage/spider/spd_environ.h

@@ -24,8 +24,6 @@
 
 #define HANDLER_HAS_DIRECT_AGGREGATE
 
-#define SPIDER_MDEV_16246
-
 #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