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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
59b6ab1f
Commit
59b6ab1f
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/space/pekka/ndb/version/my51
parents
ef5b8beb
0c4ef915
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sql/event_executor.cc
sql/event_executor.cc
+5
-5
No files found.
sql/event_executor.cc
View file @
59b6ab1f
...
@@ -329,7 +329,7 @@ executor_wait_till_next_event_exec(THD *thd)
...
@@ -329,7 +329,7 @@ executor_wait_till_next_event_exec(THD *thd)
if
(
!
evex_queue_num_elements
(
EVEX_EQ_NAME
))
if
(
!
evex_queue_num_elements
(
EVEX_EQ_NAME
))
{
{
VOID
(
pthread_mutex_unlock
(
&
LOCK_event_arrays
));
VOID
(
pthread_mutex_unlock
(
&
LOCK_event_arrays
));
DBUG_RETURN
(
1
);
DBUG_RETURN
(
WAIT_STATUS_EMPTY_QUEUE
);
}
}
et
=
evex_queue_first_element
(
&
EVEX_EQ_NAME
,
event_timed
*
);
et
=
evex_queue_first_element
(
&
EVEX_EQ_NAME
,
event_timed
*
);
DBUG_ASSERT
(
et
);
DBUG_ASSERT
(
et
);
...
@@ -368,13 +368,13 @@ executor_wait_till_next_event_exec(THD *thd)
...
@@ -368,13 +368,13 @@ executor_wait_till_next_event_exec(THD *thd)
}
}
}
}
int
ret
=
0
;
int
ret
=
WAIT_STATUS_READY
;
if
(
!
evex_queue_num_elements
(
EVEX_EQ_NAME
))
if
(
!
evex_queue_num_elements
(
EVEX_EQ_NAME
))
ret
=
1
;
ret
=
WAIT_STATUS_EMPTY_QUEUE
;
else
if
(
evex_queue_first_element
(
&
EVEX_EQ_NAME
,
event_timed
*
)
!=
et
)
else
if
(
evex_queue_first_element
(
&
EVEX_EQ_NAME
,
event_timed
*
)
!=
et
)
ret
=
2
;
ret
=
WAIT_STATUS_NEW_TOP_EVENT
;
if
(
thd
->
killed
&&
event_executor_running_global_var
)
if
(
thd
->
killed
&&
event_executor_running_global_var
)
ret
=
3
;
ret
=
WAIT_STATUS_STOP_EXECUTOR
;
DBUG_RETURN
(
ret
);
DBUG_RETURN
(
ret
);
}
}
...
...
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