diff options
| author | unknown <andrey@lmy004.> | 2005-12-16 09:49:24 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2005-12-16 09:49:24 +0100 |
| commit | 2d11a567105500fef4b32b2568ed64f38369c2e2 (patch) | |
| tree | f8523a6c47a8f9380be3335346de2fff8e6c9e9f /sql | |
| parent | 20bcd568438831b6d9bc1e2ab51b705a9d2649d8 (diff) | |
| download | mariadb-git-2d11a567105500fef4b32b2568ed64f38369c2e2.tar.gz | |
WL#1034 update
fix bug with DROP EVENT non_existant; giving back OK + warning
sql/share/errmsg.txt:
fix error message
sql/sql_parse.cc:
check the result from the function so in case of non-existing
event don't return OK which will make the error already thrown
an warning
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/share/errmsg.txt | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index abd4b746aa8..0f5358d8176 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5726,7 +5726,7 @@ ER_EVENT_ALREADY_EXISTS ER_EVENT_STORE_FAILED eng "Failed to store event %s. Error code %d from storage engine." ER_EVENT_DOES_NOT_EXIST - eng "Event %s does not exist" + eng "Unknown event '%s'" ER_EVENT_CANT_ALTER eng "Failed to alter event %s" ER_EVENT_DROP_FAILED diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c21d62952bf..f06fa0bbafe 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3696,7 +3696,7 @@ end_with_restore_list: res= evex_update_event(thd, lex->et, lex->spname); break; case SQLCOM_DROP_EVENT: - evex_drop_event(thd, lex->et, lex->drop_if_exists); + res= evex_drop_event(thd, lex->et, lex->drop_if_exists); default:; } if (!res) |