summaryrefslogtreecommitdiff
path: root/sql/events.h
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-08-26 12:01:43 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-08-26 12:01:43 +0200
commit7f0386545b7c6da30c6e050ed80f33b89d14dd72 (patch)
treead2688f7f6beb9650cc0cee6b0b56e831dd10433 /sql/events.h
parent5966e58254ebe63ff13cf7291861ae40fb58e2dd (diff)
downloadmariadb-git-7f0386545b7c6da30c6e050ed80f33b89d14dd72.tar.gz
Bug #44171 KILL ALTER EVENT can crash the server
This assert could be triggered if ALTER EVENT failed to load the event after altering it. Failing to load the event could for example happen because of KILL QUERY. The assert tested that the result of a failed load_named_event() was OP_LOAD_ERROR. However since load_named_event() returns bool, this assert did not make any sense. This patch therefore removes the assert, fixing the problem. The patch also removes enum_events_error_code since it was unused. No test case added. The bug fix is trivial and this bug was easily detected by RQG tests. Further, adding a MTR test case for this bug would require adding sync points to make the test case repeatable.
Diffstat (limited to 'sql/events.h')
-rw-r--r--sql/events.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/events.h b/sql/events.h
index 1482e736d29..f3ebc6da4ad 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -44,19 +44,6 @@ class THD;
typedef class Item COND;
typedef struct charset_info_st CHARSET_INFO;
-/* Return codes */
-enum enum_events_error_code
-{
- OP_OK= 0,
- OP_NOT_RUNNING,
- OP_CANT_KILL,
- OP_CANT_INIT,
- OP_DISABLED_EVENT,
- OP_LOAD_ERROR,
- OP_ALREADY_EXISTS
-};
-
-
int
sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);