bk commit into 5.1 tree (andrey:1.2079)

[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.2079 06/01/23 13:07:31 andrey@lmy004. +5 -0
  Merge

  scripts/mysql_create_system_tables.sh
    1.32 06/01/23 13:07:27 andrey@lmy004. +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.442 06/01/23 13:02:39 andrey@lmy004. +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.75 06/01/23 13:02:39 andrey@lmy004. +0 -0
    Auto merged

  sql/mysql_priv.h
    1.373 06/01/23 13:02:38 andrey@lmy004. +0 -0
    Auto merged

  sql/event.h
    1.14 06/01/23 13:02:38 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-tt-copy-works/RESYNC

--- 1.372/sql/mysql_priv.h	2006-01-20 12:33:53 +01:00
+++ 1.373/sql/mysql_priv.h	2006-01-23 13:02:38 +01:00
@@ -1532,6 +1532,9 @@
 void make_truncated_value_warning(THD *thd, const char *str_val,
 				  uint str_length, timestamp_type time_type,
                                   const char *field_name);
+
+bool date_add_interval(TIME *ltime, interval_type int_type, INTERVAL interval);
+
 extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,
 					       const char *format_str,
 					       uint format_length);

--- 1.441/sql/sql_yacc.yy	2006-01-23 09:31:00 +01:00
+++ 1.442/sql/sql_yacc.yy	2006-01-23 13:02:39 +01:00
@@ -1418,7 +1418,7 @@
                 YYABORT;
                 break;
               case EVEX_BAD_PARAMS:
-                my_error(ER_EVENT_INTERVAL_NOT_POSITIVE, MYF(0));
+                my_error(ER_EVENT_INTERVAL_NOT_POSITIVE_OR_TOO_BIG, MYF(0));
                 YYABORT;
                 break;
               }

--- 1.13/sql/event.h	2006-01-13 07:26:34 +01:00
+++ 1.14/sql/event.h	2006-01-23 13:02:38 +01:00
@@ -143,12 +143,12 @@
 
   int
   load_from_row(MEM_ROOT *mem_root, TABLE *table);
-  
+
   bool
   compute_next_execution_time();  
 
   void
-  mark_last_executed();
+  mark_last_executed(THD *thd);
   
   int
   drop(THD *thd);

--- 1.74/sql/share/errmsg.txt	2006-01-19 03:56:00 +01:00
+++ 1.75/sql/share/errmsg.txt	2006-01-23 13:02:39 +01:00
@@ -5769,8 +5769,8 @@
         eng "Failed to alter event '%-.64s'"
 ER_EVENT_DROP_FAILED
         eng "Failed to drop %s"
-ER_EVENT_INTERVAL_NOT_POSITIVE
-        eng "INTERVAL must be positive"
+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"
 ER_EVENT_EXEC_TIME_IN_THE_PAST

--- 1.31/scripts/mysql_create_system_tables.sh	2006-01-19 03:56:00 +01:00
+++ 1.32/scripts/mysql_create_system_tables.sh	2006-01-23 13:07:27 +01:00
@@ -43,6 +43,7 @@
 i_tzn="" i_tz="" i_tzt="" i_tztt="" i_tzls="" i_pl=""
 c_p="" c_pp=""
 c_gl="" c_sl=""
+c_ev= ""
 
 # Check for old tables
 if test ! -f $mdata/db.frm