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
b3a27618
Commit
b3a27618
authored
6 years ago
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove warning when using ScopedStatementReplication
parent
3e03b3dc
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
sql/sql_class.h
sql/sql_class.h
+10
-0
sql/sql_update.cc
sql/sql_update.cc
+6
-4
No files found.
sql/sql_class.h
View file @
b3a27618
...
@@ -4078,6 +4078,16 @@ class THD :public Statement,
...
@@ -4078,6 +4078,16 @@ class THD :public Statement,
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
inline
enum_binlog_format
get_current_stmt_binlog_format
()
{
return
current_stmt_binlog_format
;
}
inline
void
set_current_stmt_binlog_format
(
enum_binlog_format
format
)
{
current_stmt_binlog_format
=
format
;
}
inline
void
set_current_stmt_binlog_format_row
()
inline
void
set_current_stmt_binlog_format_row
()
{
{
DBUG_ENTER
(
"set_current_stmt_binlog_format_row"
);
DBUG_ENTER
(
"set_current_stmt_binlog_format_row"
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_update.cc
View file @
b3a27618
...
@@ -2850,17 +2850,19 @@ bool multi_update::send_eof()
...
@@ -2850,17 +2850,19 @@ bool multi_update::send_eof()
break
;
break
;
}
}
}
}
ScopedStatementReplication
scoped_stmt_rpl
(
force_stmt
?
thd
:
NULL
);
enum_binlog_format
save_binlog_format
;
save_binlog_format
=
thd
->
get_current_stmt_binlog_format
();
if
(
force_stmt
)
thd
->
set_current_stmt_binlog_format_stmt
();
if
(
thd
->
binlog_query
(
THD
::
ROW_QUERY_TYPE
,
thd
->
query
(),
if
(
thd
->
binlog_query
(
THD
::
ROW_QUERY_TYPE
,
thd
->
query
(),
thd
->
query_length
(),
transactional_tables
,
FALSE
,
thd
->
query_length
(),
transactional_tables
,
FALSE
,
FALSE
,
errcode
))
FALSE
,
errcode
))
{
local_error
=
1
;
// Rollback update
local_error
=
1
;
// Rollback update
}
thd
->
set_current_stmt_binlog_format
(
save_binlog_format
);
}
}
}
}
DBUG_ASSERT
(
trans_safe
||
!
updated
||
DBUG_ASSERT
(
trans_safe
||
!
updated
||
thd
->
transaction
.
stmt
.
modified_non_trans_table
);
thd
->
transaction
.
stmt
.
modified_non_trans_table
);
if
(
likely
(
local_error
!=
0
))
if
(
likely
(
local_error
!=
0
))
...
...
This diff is collapsed.
Click to expand it.
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