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
adf6e145
Commit
adf6e145
authored
Oct 01, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win fixes in semisync plugin
parent
36c738e4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.cc
+0
-9
No files found.
plugin/semisync/semisync_master.cc
View file @
adf6e145
...
@@ -48,11 +48,7 @@ static int getWaitTime(const struct timespec& start_ts);
...
@@ -48,11 +48,7 @@ static int getWaitTime(const struct timespec& start_ts);
static
unsigned
long
long
timespec_to_usec
(
const
struct
timespec
*
ts
)
static
unsigned
long
long
timespec_to_usec
(
const
struct
timespec
*
ts
)
{
{
#ifndef __WIN__
return
(
unsigned
long
long
)
ts
->
tv_sec
*
TIME_MILLION
+
ts
->
tv_nsec
/
TIME_THOUSAND
;
return
(
unsigned
long
long
)
ts
->
tv_sec
*
TIME_MILLION
+
ts
->
tv_nsec
/
TIME_THOUSAND
;
#else
return
ts
->
tv
.
i64
/
10
;
#endif
/* __WIN__ */
}
}
/*******************************************************************************
/*******************************************************************************
...
@@ -681,10 +677,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
...
@@ -681,10 +677,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
}
}
/* Calcuate the waiting period. */
/* Calcuate the waiting period. */
#ifdef __WIN__
abstime
.
tv
.
i64
=
start_ts
.
tv
.
i64
+
(
__int64
)
wait_timeout_
*
TIME_THOUSAND
*
10
;
abstime
.
max_timeout_msec
=
(
long
)
wait_timeout_
;
#else
unsigned
long
long
diff_nsecs
=
unsigned
long
long
diff_nsecs
=
start_ts
.
tv_nsec
+
(
unsigned
long
long
)
wait_timeout_
*
TIME_MILLION
;
start_ts
.
tv_nsec
+
(
unsigned
long
long
)
wait_timeout_
*
TIME_MILLION
;
abstime
.
tv_sec
=
start_ts
.
tv_sec
;
abstime
.
tv_sec
=
start_ts
.
tv_sec
;
...
@@ -694,7 +686,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
...
@@ -694,7 +686,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name,
diff_nsecs
-=
TIME_BILLION
;
diff_nsecs
-=
TIME_BILLION
;
}
}
abstime
.
tv_nsec
=
diff_nsecs
;
abstime
.
tv_nsec
=
diff_nsecs
;
#endif
/* __WIN__ */
/* In semi-synchronous replication, we wait until the binlog-dump
/* In semi-synchronous replication, we wait until the binlog-dump
* thread has received the reply on the relevant binlog segment from the
* thread has received the reply on the relevant binlog segment from the
...
...
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