Commit 796e45a2 authored by andrey@lmy004's avatar andrey@lmy004

don't use magic numbers when there are already constants

(forgotten to be committed)
parent d1056a7c
...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment