Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into lmy004.:/work/mysql-5.1-bug16410

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16410
700ff439 · unknown · 03a0eb63 · 9d5bf35d · 700ff439 · 700ff439
Commit 700ff439 authored Feb 15, 2006 by unknown
Showing with 264 additions and 260 deletions

dbug/Makefile.am dbug/Makefile.am +1 -1

sql/event.h sql/event.h +22 -22

sql/event_priv.h sql/event_priv.h +2 -2

sql/event_timed.cc sql/event_timed.cc +239 -235

No files found.
--- a/dbug/Makefile.am
+++ b/dbug/Makefile.am
@@ -21,7 +21,7 @@ pkglib_LIBRARIES =      libdbug.a
 noinst_HEADERS =        dbug_long.h
 libdbug_a_SOURCES =     dbug.c sanity.c
 EXTRA_DIST =            example1.c example2.c example3.c \
-                        user.r monty.doc readme.prof dbug_add_tags.pl \
+                        user.r monty.doc dbug_add_tags.pl \
                        my_main.c main.c factorial.c dbug_analyze.c
 NROFF_INC =             example1.r example2.r example3.r main.r \
                        factorial.r output1.r output2.r output3.r \

--- a/sql/event.h
+++ b/sql/event.h
--- a/sql/event_priv.h
+++ b/sql/event_priv.h
--- a/sql/event_timed.cc
+++ b/sql/event_timed.cc