diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-10-03 17:05:33 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-10-03 17:05:33 +0500 |
| commit | fd5ea175a32281319f41e64132d4a60040e8e8b7 (patch) | |
| tree | 212ecdc26c51464e7b1c0b3f4bb29747039dc3d3 /sql | |
| parent | 7dad8e692e713c3ea93dee9436a686365e0de22b (diff) | |
| download | mariadb-git-fd5ea175a32281319f41e64132d4a60040e8e8b7.tar.gz | |
sql_yacc.yy:
After merge fix.
field.cc:
After merge fix
sql/field.cc:
After merge fix
sql/sql_yacc.yy:
After merge fix.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 63b516b992b..0eed60a344f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d55e32a2c42..e48c7d5fad6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1353,7 +1353,7 @@ event_tail: Lex->sql_command= SQLCOM_CREATE_EVENT; Lex->expr_allows_subselect= TRUE; } - + ; ev_schedule_time: EVERY_SYM expr interval { |