Skip to content

M
mariadb
Commit 0cfb76b8 authored by bar@mysql.com/bar.intranet.mysql.r18.ru's avatar bar@mysql.com/bar.intranet.mysql.r18.ru
Browse files
Options

sql_yacc.yy: 

  After merge fix.
field.cc:
  After merge fix
parent 3cfbe36a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
sql/field.cc
View file @ 0cfb76b8
...@@ -3574,7 +3574,6 @@ void Field_long::sql_type(String &res) const ...@@ -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;
......
sql/sql_yacc.yy
View file @ 0cfb76b8
...@@ -1353,7 +1353,7 @@ event_tail: ...@@ -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
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7