Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e62fc09b
Commit
e62fc09b
authored
Jun 19, 2024
by
Yuchen Pei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-28896 Spider: remove #ifdef SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
new_data is const since at least 2017:
a05a610d
parent
443f5f25
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
28 deletions
+0
-28
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+0
-15
storage/spider/ha_spider.h
storage/spider/ha_spider.h
+0
-12
storage/spider/spd_environ.h
storage/spider/spd_environ.h
+0
-1
No files found.
storage/spider/ha_spider.cc
View file @
e62fc09b
...
@@ -7879,19 +7879,11 @@ int ha_spider::end_bulk_update(
...
@@ -7879,19 +7879,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
));
...
@@ -7899,17 +7891,10 @@ int ha_spider::bulk_update_row(
...
@@ -7899,17 +7891,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
();
...
...
storage/spider/ha_spider.h
View file @
e62fc09b
...
@@ -393,7 +393,6 @@ class ha_spider final : public handler
...
@@ -393,7 +393,6 @@ class ha_spider final : public handler
ha_rows
*
dup_key_found
ha_rows
*
dup_key_found
);
);
int
end_bulk_update
();
int
end_bulk_update
();
#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
,
...
@@ -403,17 +402,6 @@ class ha_spider final : public handler
...
@@ -403,17 +402,6 @@ class ha_spider final : public handler
const
uchar
*
old_data
,
const
uchar
*
old_data
,
const
uchar
*
new_data
const
uchar
*
new_data
);
);
#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
,
...
...
storage/spider/spd_environ.h
View file @
e62fc09b
...
@@ -22,5 +22,4 @@
...
@@ -22,5 +22,4 @@
#define HANDLER_HAS_TOP_TABLE_FIELDS
#define HANDLER_HAS_TOP_TABLE_FIELDS
#define PARTITION_HAS_GET_PART_SPEC
#define PARTITION_HAS_GET_PART_SPEC
#define SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
#endif
/* SPD_ENVIRON_INCLUDED */
#endif
/* SPD_ENVIRON_INCLUDED */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment