From f774c33a9dac492d493fac2fd432ce6e11a37973 Mon Sep 17 00:00:00 2001
From: Yusuke Abe <moonset20@gmail.com>
Date: Mon, 20 Jun 2022 12:57:47 +0900
Subject: [PATCH] MDEV-27809 Spider: remove #ifdef
 SPIDER_I_S_USE_SHOW_FOR_COLUMN

Reviewed by: Nayuta Yanagisawa
---
 storage/spider/spd_environ.h |  1 -
 storage/spider/spd_i_s.cc    | 33 ---------------------------------
 2 files changed, 34 deletions(-)

diff --git a/storage/spider/spd_environ.h b/storage/spider/spd_environ.h
index d246a37b055..ccdc7009f9a 100644
--- a/storage/spider/spd_environ.h
+++ b/storage/spider/spd_environ.h
@@ -26,5 +26,4 @@
 #define HA_EXTRA_HAS_STARTING_ORDERED_INDEX_SCAN
 #define HANDLER_HAS_CAN_USE_FOR_AUTO_INC_INIT
 #define SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
-#define SPIDER_I_S_USE_SHOW_FOR_COLUMN
 #endif /* SPD_ENVIRON_INCLUDED */
diff --git a/storage/spider/spd_i_s.cc b/storage/spider/spd_i_s.cc
index 22cd8eb0f15..7db9537136a 100644
--- a/storage/spider/spd_i_s.cc
+++ b/storage/spider/spd_i_s.cc
@@ -41,7 +41,6 @@ static struct st_mysql_storage_engine spider_i_s_info =
 { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION };
 
 namespace Show {
-#ifdef SPIDER_I_S_USE_SHOW_FOR_COLUMN
 static ST_FIELD_INFO spider_i_s_alloc_mem_fields_info[] =
 {
   Column("ID",                ULong(10),     NOT_NULL, "id"),
@@ -54,27 +53,6 @@ static ST_FIELD_INFO spider_i_s_alloc_mem_fields_info[] =
   Column("FREE_MEM_COUNT",    ULonglong(20), NULLABLE, "free_mem_count"),
   CEnd()
 };
-#else
-static ST_FIELD_INFO spider_i_s_alloc_mem_fields_info[] =
-{
-  {"ID", 10, MYSQL_TYPE_LONG, 0, MY_I_S_UNSIGNED, "id", SKIP_OPEN_TABLE},
-  {"FUNC_NAME", 64, MYSQL_TYPE_STRING, 0,
-    MY_I_S_MAYBE_NULL, "func_name", SKIP_OPEN_TABLE},
-  {"FILE_NAME", 64, MYSQL_TYPE_STRING, 0,
-    MY_I_S_MAYBE_NULL, "file_name", SKIP_OPEN_TABLE},
-  {"LINE_NO", 10, MYSQL_TYPE_LONG, 0,
-    MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "line_no", SKIP_OPEN_TABLE},
-  {"TOTAL_ALLOC_MEM", 20, MYSQL_TYPE_LONGLONG, 0,
-    MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "total_alloc_mem", SKIP_OPEN_TABLE},
-  {"CURRENT_ALLOC_MEM", 20, MYSQL_TYPE_LONGLONG, 0,
-    MY_I_S_MAYBE_NULL, "current_alloc_mem", SKIP_OPEN_TABLE},
-  {"ALLOC_MEM_COUNT", 20, MYSQL_TYPE_LONGLONG, 0,
-    MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "alloc_mem_count", SKIP_OPEN_TABLE},
-  {"FREE_MEM_COUNT", 20, MYSQL_TYPE_LONGLONG, 0,
-    MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL, "free_mem_count", SKIP_OPEN_TABLE},
-  {NULL, 0,  MYSQL_TYPE_STRING, 0, 0, NULL, 0}
-};
-#endif
 } // namespace Show
 
 static int spider_i_s_alloc_mem_fill_table(
@@ -180,7 +158,6 @@ struct st_maria_plugin spider_i_s_alloc_mem_maria =
 extern SPIDER_DBTON spider_dbton[SPIDER_DBTON_SIZE];
 
 namespace Show {
-#ifdef SPIDER_I_S_USE_SHOW_FOR_COLUMN
 static ST_FIELD_INFO spider_i_s_wrapper_protocols_fields_info[] =
 {
   Column("WRAPPER_NAME",        Varchar(NAME_CHAR_LEN), NOT_NULL, ""),
@@ -189,16 +166,6 @@ static ST_FIELD_INFO spider_i_s_wrapper_protocols_fields_info[] =
   Column("WRAPPER_MATURITY",    Varchar(12),            NOT_NULL, ""),
   CEnd()
 };
-#else
-static ST_FIELD_INFO spider_i_s_wrapper_protocols_fields_info[] =
-{
-  {"WRAPPER_NAME", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
-  {"WRAPPER_VERSION", 20, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
-  {"WRAPPER_DESCRIPTION", 65535, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE},
-  {"WRAPPER_MATURITY", 12, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
-  {0, 0,  MYSQL_TYPE_STRING, 0, 0, 0, 0}
-};
-#endif
 } // namespace Show
 
 static int spider_i_s_wrapper_protocols_fill_table(