MDEV-27660 Spider: remove #ifdef SPIDER_HANDLER_START_BULK_INSERT_HAS…

…_FLAGS (#2012) Remove unnecessary #ifdefs and dead code in Spider. ha_spider::start_bulk_insert without uint flags is not used because handler::ha_start_bulk_insert calls start_bulk_insert for each storage engine with flags. Therefore, dead code and #ifdef related to SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS have been removed.
MariaDB · Feb 11, 2022 · 362c5fb · 362c5fb
1 parent c817fda
commit 362c5fb
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
@@ -8264,16 +8264,10 @@ void ha_spider::release_auto_increment()
   DBUG_VOID_RETURN;
 }
 
-#ifdef SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS
 void ha_spider::start_bulk_insert(
   ha_rows rows,
   uint flags
 )
-#else
-void ha_spider::start_bulk_insert(
-  ha_rows rows
-)
-#endif
 {
   DBUG_ENTER("ha_spider::start_bulk_insert");
   DBUG_PRINT("info",("spider this=%p", this));

diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h
@@ -390,16 +390,10 @@ class ha_spider final : public handler
     ulonglong value
   );
   void release_auto_increment();
-#ifdef SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS
   void start_bulk_insert(
     ha_rows rows,
     uint flags
   );
-#else
-  void start_bulk_insert(
-    ha_rows rows
-  );
-#endif
   int end_bulk_insert();
   int write_row(
     const uchar *buf

diff --git a/storage/spider/spd_environ.h b/storage/spider/spd_environ.h
@@ -20,7 +20,6 @@
 
 #ifndef SPD_ENVIRON_INCLUDED
 
-#define SPIDER_HANDLER_START_BULK_INSERT_HAS_FLAGS
 #define SPIDER_SUPPORT_CREATE_OR_REPLACE_TABLE
 #define SPIDER_NET_HAS_THD
 #define HANDLER_HAS_TOP_TABLE_FIELDS