diff options
| author | unknown <andrey@lmy004.> | 2006-05-22 21:57:23 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-05-22 21:57:23 +0200 |
| commit | 261a42b8d04c3baf10912648b9efb172572cfe62 (patch) | |
| tree | 865508c258a762ab057b4a98df18e7773654b3b4 /libmysqld/Makefile.am | |
| parent | a10e279333330c0723f3f908fb4464087c84054b (diff) | |
| parent | f4781a7e4cf2825d42e9df481a42d47a48b1dfb3 (diff) | |
| download | mariadb-git-261a42b8d04c3baf10912648b9efb172572cfe62.tar.gz | |
manual merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/events_logs_tests.result:
Auto merged
mysql-test/r/events_microsec.result:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/events_stress.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
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 |