diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
| commit | ac7ba1bcaac891b046ad028e035487da44448eeb (patch) | |
| tree | 76a0977cebe3775f61ae3281cc608601eb883243 /libmysqld | |
| parent | f89b2496ffdf96d1d4b32099d38ce0565ac1d93a (diff) | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| download | mariadb-git-ac7ba1bcaac891b046ad028e035487da44448eeb.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index ab81faa7734..65b8e12bc26 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -132,7 +132,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.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/sql_signal.cc ../sql/rpl_handler.cc ${GEN_SOURCES} ${LIB_SOURCES}) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index b80381de5be..ec73741eaaf 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -78,7 +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 + sql_servers.cc event_parse_data.cc sql_signal.cc \ + rpl_handler.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) |