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
19cd9da7
Commit
19cd9da7
authored
Jan 26, 2006
by
andrey@lmy004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for bug#16434 (Events: Illegal dates don't cause errors)
(post-review commit) WL#1034 (Internal CRON)
parent
068557b2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
sql/event_timed.cc
sql/event_timed.cc
+0
-3
sql/share/errmsg.txt
sql/share/errmsg.txt
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+19
-1
No files found.
sql/event_timed.cc
View file @
19cd9da7
...
@@ -238,9 +238,6 @@ event_timed::init_starts(THD *thd, Item *new_starts)
...
@@ -238,9 +238,6 @@ event_timed::init_starts(THD *thd, Item *new_starts)
if
(
new_starts
->
fix_fields
(
thd
,
&
new_starts
))
if
(
new_starts
->
fix_fields
(
thd
,
&
new_starts
))
DBUG_RETURN
(
EVEX_PARSE_ERROR
);
DBUG_RETURN
(
EVEX_PARSE_ERROR
);
if
(
new_starts
->
val_int
()
==
MYSQL_TIMESTAMP_ERROR
)
DBUG_RETURN
(
EVEX_BAD_PARAMS
);
if
((
not_used
=
new_starts
->
get_date
(
&
ltime
,
TIME_NO_ZERO_DATE
)))
if
((
not_used
=
new_starts
->
get_date
(
&
ltime
,
TIME_NO_ZERO_DATE
)))
DBUG_RETURN
(
EVEX_BAD_PARAMS
);
DBUG_RETURN
(
EVEX_BAD_PARAMS
);
...
...
sql/share/errmsg.txt
View file @
19cd9da7
...
@@ -5760,7 +5760,7 @@ ER_EVENT_DROP_FAILED
...
@@ -5760,7 +5760,7 @@ ER_EVENT_DROP_FAILED
ER_EVENT_INTERVAL_NOT_POSITIVE
ER_EVENT_INTERVAL_NOT_POSITIVE
eng "INTERVAL must be positive"
eng "INTERVAL must be positive"
ER_EVENT_ENDS_BEFORE_STARTS
ER_EVENT_ENDS_BEFORE_STARTS
eng "ENDS
must be after
STARTS"
eng "ENDS
is either invalid or before
STARTS"
ER_EVENT_EXEC_TIME_IN_THE_PAST
ER_EVENT_EXEC_TIME_IN_THE_PAST
eng "Activation (AT) time is in the past"
eng "Activation (AT) time is in the past"
ER_EVENT_OPEN_TABLE_FAILED
ER_EVENT_OPEN_TABLE_FAILED
...
...
sql/sql_yacc.yy
View file @
19cd9da7
...
@@ -1467,7 +1467,25 @@ ev_starts: /* empty */
...
@@ -1467,7 +1467,25 @@ ev_starts: /* empty */
{
{
LEX *lex= Lex;
LEX *lex= Lex;
if (!lex->et_compile_phase)
if (!lex->et_compile_phase)
lex->et->init_starts(YYTHD, $2);
{
switch (lex->et->init_starts(YYTHD, $2)) {
case EVEX_PARSE_ERROR:
yyerror(ER(ER_SYNTAX_ERROR));
YYABORT;
break;
case EVEX_BAD_PARAMS:
{
char buff[20];
String str(buff,(uint32) sizeof(buff), system_charset_info);
String *str2= $2->val_str(&str);
my_error(ER_WRONG_VALUE, MYF(0), "STARTS", str2? str2->c_ptr():
NULL);
YYABORT;
break;
}
}
}
}
}
;
;
...
...
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