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
54a36531
Commit
54a36531
authored
Oct 17, 2013
by
Luis Soares
Browse files
Options
Browse Files
Download
Plain Diff
BUG#17508351
Merging mysql-5.5 bug branch into latest mysql-5.5.
parents
633cc16e
d97df1e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.cc
+2
-8
No files found.
plugin/semisync/semisync_master.cc
View file @
54a36531
...
@@ -894,10 +894,7 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
...
@@ -894,10 +894,7 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
* target, do not request replies from the slave.
* target, do not request replies from the slave.
*/
*/
if
(
!
getMasterEnabled
()
||
!
is_semi_sync_slave
())
if
(
!
getMasterEnabled
()
||
!
is_semi_sync_slave
())
{
sync
=
false
;
return
0
;
return
0
;
}
function_enter
(
kWho
);
function_enter
(
kWho
);
...
@@ -905,15 +902,12 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
...
@@ -905,15 +902,12 @@ int ReplSemiSyncMaster::updateSyncHeader(unsigned char *packet,
/* This is the real check inside the mutex. */
/* This is the real check inside the mutex. */
if
(
!
getMasterEnabled
())
if
(
!
getMasterEnabled
())
{
goto
l_end
;
// sync= false at this point in time
sync
=
false
;
goto
l_end
;
}
if
(
is_on
())
if
(
is_on
())
{
{
/* semi-sync is ON */
/* semi-sync is ON */
sync
=
false
;
/*
No sync unless a transaction is involved. */
/* sync= false;
No sync unless a transaction is involved. */
if
(
reply_file_name_inited_
)
if
(
reply_file_name_inited_
)
{
{
...
...
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