diff options
| author | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-18 23:00:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2010-01-18 23:00:48 +0100 |
| commit | ba23a0139db3f06460a2ebd010e7103d38bfdb84 (patch) | |
| tree | 3c1cefd03a6d459d29396a65e71d249ea12fa5b9 /libmysqld | |
| parent | 10a7c78ed4a57cba4e5cb5ce53388ce162a568bf (diff) | |
| parent | 33c075e842324cfdf0aab055c2db8d0d50bcbc68 (diff) | |
| download | mariadb-git-ba23a0139db3f06460a2ebd010e7103d38bfdb84.tar.gz | |
merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9f753593a14..0f62bf6eb64 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -80,6 +80,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.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/rpl_utility.cc ../sql/sys_vars.cc ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc ${GEN_SOURCES} diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 2dde00ad38a..ffa77bcfca5 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -56,7 +56,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ item_geofunc.cc item_subselect.cc item_row.cc\ item_xmlfunc.cc \ key.cc lock.cc log.cc sql_state.c \ - log_event.cc rpl_record.cc \ + log_event.cc rpl_record.cc rpl_utility.cc \ log_event_old.cc rpl_record_old.cc \ protocol.cc net_serv.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ |