Commit fd5ea175 authored by unknown's avatar unknown
Browse files

sql_yacc.yy: 

  After merge fix.
field.cc:
  After merge fix


sql/field.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix.
parent 7dad8e69

sql/field.cc

+0 −1
Original line number Diff line number Diff line
@@ -3574,7 +3574,6 @@ void Field_long::sql_type(String &res) const 
int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)

{

  ASSERT_COLUMN_MARKED_FOR_WRITE;

  longlong tmp;

  int error= 0;

  char *end;

  ulonglong tmp;

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ event_tail: 
            Lex->sql_command= SQLCOM_CREATE_EVENT;

            Lex->expr_allows_subselect= TRUE;

          }



      ;



ev_schedule_time: EVERY_SYM expr interval

	  {