diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-26 05:39:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-26 05:39:48 +0100 |
| commit | 9129685e5103bbe23b1f66dc89b0f994c52600b9 (patch) | |
| tree | 12bd4cc946e8564dee1b5fb2030283eec5878f24 /libmysqld | |
| parent | 809e20f2d7875d22374e9209902c38d0b93e3cec (diff) | |
| parent | f8a5a1284b4e37ce2b5ab9ef8dfba8522366bd11 (diff) | |
| download | mariadb-git-9129685e5103bbe23b1f66dc89b0f994c52600b9.tar.gz | |
merge, add plugin/audit_null/CMakeLists.txt
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index acc7d3fecd2..5c83db5f87c 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -78,8 +78,9 @@ SET(SQL_EMBEDDED_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/sql_signal.cc ../sql/rpl_handler.cc + ../sql/scheduler.cc ../sql/sql_audit.cc + ../sql/event_parse_data.cc + ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/rpl_utility.cc ../sql/sys_vars.cc ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index ffa77bcfca5..2e3b935cafa 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) |