diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:57:44 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-10-27 12:57:44 +0300 |
commit | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (patch) | |
tree | a009b70e1c934e05a30390fa4b5a5dbca4153154 /sql/Makefile.am | |
parent | 381ad2ec6a2bb8c951b88274598e304f695ed04c (diff) | |
parent | 453eb014f7f44cf92fa40887e17a253338c696fb (diff) | |
download | mariadb-git-cd6e15989044e5d4a708a6ee191bcd3c13dc0071.tar.gz |
Automerge from mysql-next-mr.
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b24d9369f6f..569bb70965e 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -111,7 +111,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ sql_plugin.h authors.h event_parse_data.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 + contributors.h sql_servers.h sql_signal.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 \ @@ -156,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 |