summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorrburnett@bk-internal.mysql.com <>2006-05-23 20:28:52 +0200
committerrburnett@bk-internal.mysql.com <>2006-05-23 20:28:52 +0200
commit37d1e803f1528c8624f16c74ab2f26be318b9e06 (patch)
tree6e6c0e2abc00dedcaaa6cd3f6851a483ec53cd6d /libmysqld
parent179d483355a36181844f32b29b76b721bc9b0bf4 (diff)
parentfd2792cbe43d0672b6b02648be054205739fc7bc (diff)
downloadmariadb-git-37d1e803f1528c8624f16c74ab2f26be318b9e06.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 8d1591282db..a3af2d43bd5 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -68,7 +68,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
- event_executor.cc event.cc event_timed.cc \
+ event_scheduler.cc event.cc event_timed.cc \
rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
sql_tablespace.cc \
rpl_injector.cc my_user.c partition_info.cc