summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authordlenev@mockturtle.local <>2006-09-14 23:53:35 +0400
committerdlenev@mockturtle.local <>2006-09-14 23:53:35 +0400
commit5ba1b83c9820eeab9d38f14a556cc1b9186f5213 (patch)
treea407ae8ad0f336c756ce35ff39da6ccfac735913 /libmysqld
parentfad645f23e20cdaf0ff7f1f79b25f1872bca761b (diff)
parent850ac2e8982d936adab9ec3c543b30cb42bc7b29 (diff)
downloadmariadb-git-5ba1b83c9820eeab9d38f14a556cc1b9186f5213.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 08a8d68b2e5..fe19e08328d 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -67,7 +67,8 @@ 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_scheduler.cc events.cc event_timed.cc \
+ event_scheduler.cc events.cc event_data_objects.cc \
+ event_queue.cc event_db_repository.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