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
bb35cd04
Commit
bb35cd04
authored
Apr 13, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing portability problem by using my_time_t instead of time_t.
sql/slave.cc: Using my_time_t instead of time_t.
parent
0d3f926a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
sql/slave.cc
sql/slave.cc
+2
-3
No files found.
sql/slave.cc
View file @
bb35cd04
...
@@ -1334,8 +1334,7 @@ bool show_master_info(THD* thd, MASTER_INFO* mi)
...
@@ -1334,8 +1334,7 @@ bool show_master_info(THD* thd, MASTER_INFO* mi)
if
((
mi
->
slave_running
==
MYSQL_SLAVE_RUN_CONNECT
)
&&
if
((
mi
->
slave_running
==
MYSQL_SLAVE_RUN_CONNECT
)
&&
mi
->
rli
.
slave_running
)
mi
->
rli
.
slave_running
)
{
{
long
time_diff
=
((
long
)((
time_t
)
time
((
time_t
*
)
0
)
long
time_diff
=
((
long
)(
time
(
0
)
-
mi
->
rli
.
last_master_timestamp
)
-
mi
->
rli
.
last_master_timestamp
)
-
mi
->
clock_diff_with_master
);
-
mi
->
clock_diff_with_master
);
/*
/*
Apparently on some systems time_diff can be <0. Here are possible
Apparently on some systems time_diff can be <0. Here are possible
...
@@ -3461,7 +3460,7 @@ static Log_event* next_event(RELAY_LOG_INFO* rli)
...
@@ -3461,7 +3460,7 @@ static Log_event* next_event(RELAY_LOG_INFO* rli)
the events have old timestamps (then you get "many", 0, "many").
the events have old timestamps (then you get "many", 0, "many").
Transient phases like this can't really be fixed.
Transient phases like this can't really be fixed.
*/
*/
time_t
save_timestamp
=
rli
->
last_master_timestamp
;
my_
time_t
save_timestamp
=
rli
->
last_master_timestamp
;
rli
->
last_master_timestamp
=
0
;
rli
->
last_master_timestamp
=
0
;
DBUG_ASSERT
(
rli
->
relay_log
.
get_open_count
()
==
DBUG_ASSERT
(
rli
->
relay_log
.
get_open_count
()
==
...
...
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