sql_yacc.yy:

After merge fix.
field.cc:
  After merge fix


sql/field.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix.
This commit is contained in:
unknown 2006-10-03 17:05:33 +05:00
parent 7dad8e692e
commit fd5ea175a3
2 changed files with 1 additions and 2 deletions

View File

@ -3574,7 +3574,6 @@ void Field_long::sql_type(String &res) const
int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs) int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
{ {
ASSERT_COLUMN_MARKED_FOR_WRITE; ASSERT_COLUMN_MARKED_FOR_WRITE;
longlong tmp;
int error= 0; int error= 0;
char *end; char *end;
ulonglong tmp; ulonglong tmp;

View File

@ -1353,7 +1353,7 @@ event_tail:
Lex->sql_command= SQLCOM_CREATE_EVENT; Lex->sql_command= SQLCOM_CREATE_EVENT;
Lex->expr_allows_subselect= TRUE; Lex->expr_allows_subselect= TRUE;
} }
;
ev_schedule_time: EVERY_SYM expr interval ev_schedule_time: EVERY_SYM expr interval
{ {