bk commit into 5.1 tree (andrey:1.2078)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2078 06/01/26 22:10:12 andrey@lmy004. +3 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16434

  sql/share/errmsg.txt
    1.76 06/01/26 22:10:04 andrey@lmy004. +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.445 06/01/26 22:10:03 andrey@lmy004. +0 -0
    Auto merged

  sql/event_timed.cc
    1.20 06/01/26 22:10:03 andrey@lmy004. +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug16434/RESYNC

--- 1.444/sql/sql_yacc.yy	2006-01-24 16:04:20 +01:00
+++ 1.445/sql/sql_yacc.yy	2006-01-26 22:10:03 +01:00
@@ -1466,7 +1466,25 @@
           {
             LEX *lex= Lex;
             if (!lex->et_compile_phase)
-              lex->et->init_starts(YYTHD, $2);
+            {
+              
+              switch (lex->et->init_starts(YYTHD, $2)) {
+              case EVEX_PARSE_ERROR:
+                yyerror(ER(ER_SYNTAX_ERROR));
+                YYABORT;
+                break;
+              case EVEX_BAD_PARAMS:
+                {
+                  char buff[20];
+                  String str(buff,(uint32) sizeof(buff), system_charset_info);
+                  String *str2= $2->val_str(&str);
+                  my_error(ER_WRONG_VALUE, MYF(0), "STARTS", str2? str2->c_ptr():
+                                                                   NULL);
+                  YYABORT;
+                  break;
+                }
+              }
+            }
           }
       ;
 

--- 1.19/sql/event_timed.cc	2006-01-23 16:13:37 +01:00
+++ 1.20/sql/event_timed.cc	2006-01-26 22:10:03 +01:00
@@ -300,9 +300,6 @@
   if (new_starts->fix_fields(thd, &new_starts))
     DBUG_RETURN(EVEX_PARSE_ERROR);
 
-  if (new_starts->val_int() == MYSQL_TIMESTAMP_ERROR)
-    DBUG_RETURN(EVEX_BAD_PARAMS);
-
   if ((not_used= new_starts->get_date(&ltime, TIME_NO_ZERO_DATE)))
     DBUG_RETURN(EVEX_BAD_PARAMS);
 

--- 1.75/sql/share/errmsg.txt	2006-01-23 13:02:39 +01:00
+++ 1.76/sql/share/errmsg.txt	2006-01-26 22:10:04 +01:00
@@ -5772,7 +5772,7 @@
 ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG
         eng "INTERVAL is either not positive or too big"
 ER_EVENT_ENDS_BEFORE_STARTS
-        eng "ENDS must be after STARTS"
+        eng "ENDS is either invalid or before STARTS"
 ER_EVENT_EXEC_TIME_IN_THE_PAST
         eng "Activation (AT) time is in the past"
 ER_EVENT_OPEN_TABLE_FAILED