diff options
| author | unknown <andrey@lmy004.> | 2006-02-24 12:03:32 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-24 12:03:32 +0100 |
| commit | d7d068ea22fe7570f8ec99e325b6a5b3a9d603ff (patch) | |
| tree | f6fa7223129ff08941ce75ffa5c226b7ec86a9e6 /sql/event.cc | |
| parent | 4bef6225852ea9e47eedab4f61ccefeed1e74196 (diff) | |
| parent | 17fb7f96a2617e3fb9743cc2d038862702bf9235 (diff) | |
| download | mariadb-git-d7d068ea22fe7570f8ec99e325b6a5b3a9d603ff.tar.gz | |
merge
mysql-test/r/events.result:
Auto merged
sql/event.cc:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/event_timed.cc:
manual merge
Diffstat (limited to 'sql/event.cc')
| -rw-r--r-- | sql/event.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/event.cc b/sql/event.cc index 3fa41996995..6afdb9d98b9 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); @@ -984,7 +985,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; } |