Commit 43f6f1b9 authored by unknown's avatar unknown
Browse files

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
parents 16478e1a fe1c9f9e

sql/event_timed.cc

+0 −3
Original line number Diff line number Diff line
@@ -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);

sql/share/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -5772,7 +5772,7 @@ ER_EVENT_DROP_FAILED 
ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG

        eng "INTERVAL is either not positive or too big"

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

        eng "Activation (AT) time is in the past"

ER_EVENT_OPEN_TABLE_FAILED

sql/sql_yacc.yy

+19 −1
Original line number Diff line number Diff line
@@ -1476,7 +1476,25 @@ ev_starts: /* empty */ 
          {

            LEX *lex= Lex;

            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;

                }

              }

            }

          }

      ;