summaryrefslogtreecommitdiff
path: root/sql/event.cc
diff options
context:
space:
mode:
authorandrey@lmy004. <>2006-02-20 16:06:05 +0100
committerandrey@lmy004. <>2006-02-20 16:06:05 +0100
commit2996d95257d3980a26acafb9f3fd8850c739cd17 (patch)
tree3eedf771340bb2cca5ef68e1a181745329f10f36 /sql/event.cc
parentaf149459ed169cce5693e28eb49b5196af67a9cb (diff)
downloadmariadb-git-2996d95257d3980a26acafb9f3fd8850c739cd17.tar.gz
fix for bug #16411 Events: Microsecond intervals are allowed
WL#1034
Diffstat (limited to 'sql/event.cc')
-rw-r--r--sql/event.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/event.cc b/sql/event.cc
index 93f7e9c41d0..bfb731e3a7b 100644
--- a/sql/event.cc
+++ b/sql/event.cc
@@ -438,6 +438,7 @@ common_1_lev_code:
case INTERVAL_HOUR_MICROSECOND:
case INTERVAL_MINUTE_MICROSECOND:
case INTERVAL_SECOND_MICROSECOND:
+ case INTERVAL_MICROSECOND:
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND");
return 1;
break;
@@ -494,7 +495,7 @@ evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table)
if (table_check_intact(tables.table, EVEX_FIELD_COUNT, event_table_fields,
&mysql_event_last_create_time,
- ER_EVENT_CANNOT_LOAD_FROM_TABLE))
+ ER_CANNOT_LOAD_FROM_TABLE))
{
close_thread_tables(thd);
DBUG_RETURN(2);
@@ -976,7 +977,7 @@ db_find_event(THD *thd, sp_name *name, LEX_STRING *definer, event_timed **ett,
*/
if ((ret= et->load_from_row(root, table)))
{
- my_error(ER_EVENT_CANNOT_LOAD_FROM_TABLE, MYF(0));
+ my_error(ER_CANNOT_LOAD_FROM_TABLE, MYF(0));
goto done;
}