database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
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
This commit is contained in:
unknown
2006-01-27 01:07:34 +01:00
parent 16478e1a76 fe1c9f9e04
commit 43f6f1b9d5
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/event_timed.cc
View File

@ -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(&ltime, TIME_NO_ZERO_DATE)))
DBUG_RETURN(EVEX_BAD_PARAMS);