diff options
| author | andrey@lmy004. <> | 2006-06-20 17:14:36 +0200 |
|---|---|---|
| committer | andrey@lmy004. <> | 2006-06-20 17:14:36 +0200 |
| commit | 45598df7d4dcc2bfb0762b5daf566e5ac6d16540 (patch) | |
| tree | fd0c09b50a9465f331eb5366fb20cc7888a4a8eb /libmysqld | |
| parent | f237fa784047d951b7ee90d28a7fd20c2583f465 (diff) | |
| parent | 40fe2b9a45b396c7b908ce512b3fc6c373510993 (diff) | |
| download | mariadb-git-45598df7d4dcc2bfb0762b5daf566e5ac6d16540.tar.gz | |
manual merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index ff8ceda5c5b..69d8b6e0f67 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -29,7 +29,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c ../sql-common/my_time.c ../sql-common/my_user.c ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc - ../sql/event_timed.cc ../sql/event.cc ../sql/discover.cc + ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc ../sql/ha_myisammrg.cc ${mysql_se_ha_src} diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 50f364babe1..b91944ac258 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_scheduler.cc event.cc event_timed.cc \ + event_scheduler.cc events.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 |