bk commit into 5.1 tree (andrey:1.2169) BUG#16411

[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.2169 06/02/24 14:02:26 andrey@lmy004. +1 -0
  fix for bug #16411 (Microseconds are allowed for events)

  sql/event_timed.cc
    1.38 06/02/24 14:02:14 andrey@lmy004. +0 -1
    fix problem during merge

# 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-bug16411

--- 1.37/sql/event_timed.cc	2006-02-24 12:03:25 +01:00
+++ 1.38/sql/event_timed.cc	2006-02-24 14:02:14 +01:00
@@ -1278,7 +1278,6 @@ event_timed::compile(THD *thd, MEM_ROOT 
 
   thd->update_charset();
 
-  DBUG_ENTER("event_timed::compile");
   DBUG_PRINT("info",("old_sql_mode=%d new_sql_mode=%d",old_sql_mode, sql_mode));
   thd->variables.sql_mode= this->sql_mode;
   /* Change the memory root for the execution time */