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
1812656d
Commit
1812656d
authored
Mar 16, 2007
by
kroki/tomash@moonlight.home
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation on Windows broken with the push of bug#16420.
Fix three compilation warnings.
parent
0aab823c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
sql/event_data_objects.cc
sql/event_data_objects.cc
+2
-2
sql/event_queue.cc
sql/event_queue.cc
+5
-9
No files found.
sql/event_data_objects.cc
View file @
1812656d
...
@@ -1293,7 +1293,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
...
@@ -1293,7 +1293,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
time, and this will greatly reduce the effect of the
time, and this will greatly reduce the effect of the
optimization. So instead we keep the code simple and clean.
optimization. So instead we keep the code simple and clean.
*/
*/
interval
.
month
=
diff_months
-
diff_months
%
months
;
interval
.
month
=
(
ulong
)
(
diff_months
-
diff_months
%
months
)
;
next_time
=
add_interval
(
&
local_start
,
time_zone
,
next_time
=
add_interval
(
&
local_start
,
time_zone
,
INTERVAL_MONTH
,
interval
);
INTERVAL_MONTH
,
interval
);
if
(
next_time
==
0
)
if
(
next_time
==
0
)
...
@@ -1301,7 +1301,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
...
@@ -1301,7 +1301,7 @@ bool get_next_time(const Time_zone *time_zone, my_time_t *next,
if
(
next_time
<=
time_now
)
if
(
next_time
<=
time_now
)
{
{
interval
.
month
=
months
;
interval
.
month
=
(
ulong
)
months
;
next_time
=
add_interval
(
&
local_start
,
time_zone
,
next_time
=
add_interval
(
&
local_start
,
time_zone
,
INTERVAL_MONTH
,
interval
);
INTERVAL_MONTH
,
interval
);
if
(
next_time
==
0
)
if
(
next_time
==
0
)
...
...
sql/event_queue.cc
View file @
1812656d
...
@@ -65,13 +65,10 @@ struct event_queue_param
...
@@ -65,13 +65,10 @@ struct event_queue_param
static
int
static
int
event_queue_element_compare_q
(
void
*
vptr
,
byte
*
a
,
byte
*
b
)
event_queue_element_compare_q
(
void
*
vptr
,
byte
*
a
,
byte
*
b
)
{
{
/*
my_time_t
lhs
=
((
Event_queue_element
*
)
a
)
->
execute_at
;
Note that no overflow is possible here because both values are
my_time_t
rhs
=
((
Event_queue_element
*
)
b
)
->
execute_at
;
non-negative, and subtraction is done in the signed my_time_t
type.
return
(
lhs
<
rhs
?
-
1
:
(
lhs
>
rhs
?
1
:
0
));
*/
return
(((
Event_queue_element
*
)
a
)
->
execute_at
-
((
Event_queue_element
*
)
b
)
->
execute_at
);
}
}
...
@@ -580,8 +577,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd,
...
@@ -580,8 +577,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd,
time or until signaled. Release LOCK_queue while waiting.
time or until signaled. Release LOCK_queue while waiting.
*/
*/
struct
timespec
top_time
;
struct
timespec
top_time
;
top_time
.
tv_sec
=
next_activation_at
;
set_timespec
(
top_time
,
next_activation_at
-
thd
->
query_start
());
top_time
.
tv_nsec
=
0
;
cond_wait
(
thd
,
&
top_time
,
queue_wait_msg
,
SCHED_FUNC
,
__LINE__
);
cond_wait
(
thd
,
&
top_time
,
queue_wait_msg
,
SCHED_FUNC
,
__LINE__
);
continue
;
continue
;
...
...
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