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
614b0f68
Commit
614b0f68
authored
Dec 14, 2007
by
kostja@bodhi.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove an unused argument of sql_update::do_updates().
parent
7c8fe302
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
sql/sql_class.h
sql/sql_class.h
+1
-1
sql/sql_update.cc
sql/sql_update.cc
+3
-4
No files found.
sql/sql_class.h
View file @
614b0f68
...
...
@@ -2692,7 +2692,7 @@ class multi_update :public select_result_interceptor
bool
send_data
(
List
<
Item
>
&
items
);
bool
initialize_tables
(
JOIN
*
join
);
void
send_error
(
uint
errcode
,
const
char
*
err
);
int
do_updates
(
bool
from_send_error
);
int
do_updates
(
);
bool
send_eof
();
virtual
void
abort
();
};
...
...
sql/sql_update.cc
View file @
614b0f68
...
...
@@ -1729,7 +1729,7 @@ void multi_update::abort()
todo/fixme: do_update() is never called with the arg 1.
should it change the signature to become argless?
*/
VOID
(
do_updates
(
0
));
VOID
(
do_updates
());
}
}
if
(
thd
->
transaction
.
stmt
.
modified_non_trans_table
)
...
...
@@ -1760,7 +1760,7 @@ void multi_update::abort()
}
int
multi_update
::
do_updates
(
bool
from_send_error
)
int
multi_update
::
do_updates
()
{
TABLE_LIST
*
cur_table
;
int
local_error
=
0
;
...
...
@@ -1907,7 +1907,6 @@ int multi_update::do_updates(bool from_send_error)
DBUG_RETURN
(
0
);
err:
if
(
!
from_send_error
)
{
thd
->
fatal_error
();
prepare_record_for_error_message
(
local_error
,
table
);
...
...
@@ -1949,7 +1948,7 @@ bool multi_update::send_eof()
Does updates for the last n - 1 tables, returns 0 if ok;
error takes into account killed status gained in do_updates()
*/
int
local_error
=
(
table_count
)
?
do_updates
(
0
)
:
0
;
int
local_error
=
(
table_count
)
?
do_updates
()
:
0
;
/*
if local_error is not set ON until after do_updates() then
later carried out killing should not affect binlogging.
...
...
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