diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:44:25 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:44:25 +0200 |
| commit | 284f52476c33dca8bfb3a3408e751eebd1a10ccb (patch) | |
| tree | 33d55f1c5a5d0525f51ef0549fa5c6c5f58e5dbd /libmysqld | |
| parent | 8ac88c88f0038350064429fda626233260eb6721 (diff) | |
| parent | 014b8e7f435e495151fe0ef2cfd5e93d1a398ce5 (diff) | |
| download | mariadb-git-284f52476c33dca8bfb3a3408e751eebd1a10ccb.tar.gz | |
Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 2898bf3a659..7c5b6bd5917 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -143,7 +143,8 @@ SET(LIBMYSQLD_SOURCES libmysqld.c emb_qcache.cc lib_sql.cc ../sql/multi_range_read.cc ../sql/opt_index_cond_pushdown.cc ../sql/opt_subselect.cc - ../sql/create_options.cc + ../sql/create_options.cc ../sql/rpl_utility.cc + ../sql/rpl_reporting.cc ../sql/sql_expression_cache.cc ${GEN_SOURCES} ${LIB_SOURCES}) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 682fae81c59..bf2231f47a1 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -55,7 +55,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 rpl_reporting.cc \ log_event_old.cc rpl_record_old.cc \ protocol.cc net_serv.cc opt_range.cc \ opt_subselect.cc \ |