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 | 22fe8e10e297c40bc88104fb6a13e5183238850e (patch) | |
tree | 76a0977cebe3775f61ae3281cc608601eb883243 /sql/Makefile.am | |
parent | a4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff) | |
parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
download | mariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz |
Merge from mysql-next-mr.
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 4cf41f48292..92fb86ac942 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -112,7 +112,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ event_data_objects.h event_scheduler.h \ sql_partition.h partition_info.h partition_element.h \ contributors.h sql_servers.h sql_signal.h records.h \ - sql_prepare.h + sql_prepare.h rpl_handler.h replication.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ @@ -157,7 +157,8 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ event_queue.cc event_db_repository.cc events.cc \ sql_plugin.cc sql_binlog.cc \ sql_builtin.cc sql_tablespace.cc 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 nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c |