sql_yacc.yy:

After merge fix. field.cc: After merge fix

sql_yacc.yy:
After merge fix. field.cc: After merge fix
0cfb76b8 · bar@mysql.com/bar.intranet.mysql.r18.ru · 3cfbe36a · 0cfb76b8 · 0cfb76b8
Commit 0cfb76b8 authored Oct 03, 2006 by bar@mysql.com/bar.intranet.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/field.cc sql/field.cc +0 -1

sql/sql_yacc.yy sql/sql_yacc.yy +1 -1

No files found.
--- 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;

--- 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
 	  {