diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-01-19 17:30:55 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-01-19 17:30:55 +0400 |
| commit | 667b5944a7a28dcefdd725d360b6631bd74aedc8 (patch) | |
| tree | 667b5c726df9ea2c6435bb9a13fad521165d32ec /libmysqld | |
| parent | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (diff) | |
| parent | 9130563708cbdbb488e5361af79eb9f4b9dab0ea (diff) | |
| download | mariadb-git-667b5944a7a28dcefdd725d360b6631bd74aedc8.tar.gz | |
Merge backport of WL#3771 with mysql-next-mr.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 2eeb092b759..cf6c9d19e68 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -132,7 +132,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc ../sql/partition_info.cc ../sql/sql_connect.cc - ../sql/scheduler.cc ../sql/event_parse_data.cc + ../sql/scheduler.cc ../sql/sql_audit.cc + ../sql/event_parse_data.cc ../sql/sql_signal.cc ../sql/rpl_handler.cc ${GEN_SOURCES} ${LIB_SOURCES}) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 2dde00ad38a..a0af08f51d6 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -78,8 +78,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ debug_sync.cc \ sql_tablespace.cc \ rpl_injector.cc my_user.c partition_info.cc \ - sql_servers.cc event_parse_data.cc sql_signal.cc \ - rpl_handler.cc keycaches.cc + sql_servers.cc sql_audit.cc event_parse_data.cc \ + sql_signal.cc rpl_handler.cc keycaches.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) |