Commit a5f8fe21 authored by Yuchen Pei's avatar Yuchen Pei

MDEV-28896 Spider: remove #ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA

new_data is const since at least 2017: a05a610d
parent 0610a02b
...@@ -9311,19 +9311,11 @@ int ha_spider::end_bulk_update( ...@@ -9311,19 +9311,11 @@ int ha_spider::end_bulk_update(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
int ha_spider::bulk_update_row( int ha_spider::bulk_update_row(
const uchar *old_data, const uchar *old_data,
const uchar *new_data, const uchar *new_data,
ha_rows *dup_key_found ha_rows *dup_key_found
) )
#else
int ha_spider::bulk_update_row(
const uchar *old_data,
uchar *new_data,
ha_rows *dup_key_found
)
#endif
{ {
DBUG_ENTER("ha_spider::bulk_update_row"); DBUG_ENTER("ha_spider::bulk_update_row");
DBUG_PRINT("info",("spider this=%p", this)); DBUG_PRINT("info",("spider this=%p", this));
...@@ -9331,17 +9323,10 @@ int ha_spider::bulk_update_row( ...@@ -9331,17 +9323,10 @@ int ha_spider::bulk_update_row(
DBUG_RETURN(update_row(old_data, new_data)); DBUG_RETURN(update_row(old_data, new_data));
} }
#ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
int ha_spider::update_row( int ha_spider::update_row(
const uchar *old_data, const uchar *old_data,
const uchar *new_data const uchar *new_data
) )
#else
int ha_spider::update_row(
const uchar *old_data,
uchar *new_data
)
#endif
{ {
int error_num; int error_num;
THD *thd = ha_thd(); THD *thd = ha_thd();
......
...@@ -497,7 +497,6 @@ class ha_spider final : public handler ...@@ -497,7 +497,6 @@ class ha_spider final : public handler
ha_rows *dup_key_found ha_rows *dup_key_found
) override; ) override;
int end_bulk_update() override; int end_bulk_update() override;
#ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
int bulk_update_row( int bulk_update_row(
const uchar *old_data, const uchar *old_data,
const uchar *new_data, const uchar *new_data,
...@@ -506,18 +505,7 @@ class ha_spider final : public handler ...@@ -506,18 +505,7 @@ class ha_spider final : public handler
int update_row( int update_row(
const uchar *old_data, const uchar *old_data,
const uchar *new_data const uchar *new_data
) override;
#else
int bulk_update_row(
const uchar *old_data,
uchar *new_data,
ha_rows *dup_key_found
); );
int update_row(
const uchar *old_data,
uchar *new_data
);
#endif
bool check_direct_update_sql_part( bool check_direct_update_sql_part(
st_select_lex *select_lex, st_select_lex *select_lex,
longlong select_limit, longlong select_limit,
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#define PARTITION_HAS_GET_PART_SPEC #define PARTITION_HAS_GET_PART_SPEC
#define HANDLER_HAS_NEED_INFO_FOR_AUTO_INC #define HANDLER_HAS_NEED_INFO_FOR_AUTO_INC
#define SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
#define SPIDER_MDEV_16246 #define SPIDER_MDEV_16246
#define SPIDER_USE_CONST_ITEM_FOR_STRING_INT_REAL_DECIMAL_DATE_ITEM #define SPIDER_USE_CONST_ITEM_FOR_STRING_INT_REAL_DECIMAL_DATE_ITEM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment