diff options
| author | Yuichiro Suzuki <u16suzu@gmail.com> | 2022-06-20 00:25:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 00:25:56 +0900 |
| commit | 0aadb58e22582583e561bf40f73918d8cfbfb592 (patch) | |
| tree | a14b3675b34a7b287cd7d907d3972b9a530fbd0b | |
| parent | d371e35257c45895318c4efbed20e5bfdcc7cee9 (diff) | |
| download | mariadb-git-0aadb58e22582583e561bf40f73918d8cfbfb592.tar.gz | |
MDEV-27811 Spider: remove #ifdef SPIDER_MDEV_16246
Reviewed by: Nayuta Yanagisawa
| -rw-r--r-- | storage/spider/ha_spider.cc | 4 | ||||
| -rw-r--r-- | storage/spider/ha_spider.h | 4 | ||||
| -rw-r--r-- | storage/spider/spd_environ.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 533e308dc4e..4ffe22aac0d 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -8173,7 +8173,6 @@ bool ha_spider::check_direct_update_sql_part( DBUG_RETURN(FALSE); } -#ifdef SPIDER_MDEV_16246 /** Perform initialization for a direct update request. @@ -8186,9 +8185,6 @@ bool ha_spider::check_direct_update_sql_part( 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; diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h index 561252f6fc3..4dffdf78553 100644 --- a/storage/spider/ha_spider.h +++ b/storage/spider/ha_spider.h @@ -422,13 +422,9 @@ public: longlong select_limit, longlong offset_limit ); -#ifdef SPIDER_MDEV_16246 int direct_update_rows_init( List<Item> *update_fields ); -#else - int direct_update_rows_init(); -#endif int direct_update_rows( ha_rows *update_rows, ha_rows *found_row diff --git a/storage/spider/spd_environ.h b/storage/spider/spd_environ.h index 25eec93d6d6..d246a37b055 100644 --- a/storage/spider/spd_environ.h +++ b/storage/spider/spd_environ.h @@ -26,6 +26,5 @@ #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_MDEV_16246 #define SPIDER_I_S_USE_SHOW_FOR_COLUMN #endif /* SPD_ENVIRON_INCLUDED */ |