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:
parent
7dad8e692e
commit
fd5ea175a3
@ -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;
|
||||
|
@ -1353,7 +1353,7 @@ event_tail:
|
||||
Lex->sql_command= SQLCOM_CREATE_EVENT;
|
||||
Lex->expr_allows_subselect= TRUE;
|
||||
}
|
||||
|
||||
;
|
||||
|
||||
ev_schedule_time: EVERY_SYM expr interval
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user