diff options
| author | unknown <andrey@lmy004.> | 2006-01-27 01:07:34 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-27 01:07:34 +0100 |
| commit | 43f6f1b9d5175c6f8d46e9a859219e7c520bf62c (patch) | |
| tree | a9f02481ed02b72873ca0d43315eb8e39ccf14b4 /sql/event_timed.cc | |
| parent | 16478e1a7611221b83740bf41f169df11b404aed (diff) | |
| parent | fe1c9f9e045b2f525ec58457b6fdeb144b9e0427 (diff) | |
| download | mariadb-git-43f6f1b9d5175c6f8d46e9a859219e7c520bf62c.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16434
sql/event_timed.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/event_timed.cc')
| -rw-r--r-- | sql/event_timed.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/event_timed.cc b/sql/event_timed.cc index 4e64ad2ee54..4d3dea42e34 100644 --- a/sql/event_timed.cc +++ b/sql/event_timed.cc @@ -300,9 +300,6 @@ event_timed::init_starts(THD *thd, Item *new_starts) if (new_starts->fix_fields(thd, &new_starts)) 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(<ime, TIME_NO_ZERO_DATE))) DBUG_RETURN(EVEX_BAD_PARAMS); |