diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 23:19:47 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 23:19:47 +0100 |
commit | 5b77604cc2d76bf78af113096001c21067970841 (patch) | |
tree | bb2aacb96d3588f443a65da32dbfa2b6508efb80 /sql/Makefile.am | |
parent | 14e563ce5f05498d0a4a9aabd73e02690d093cb0 (diff) | |
parent | ab293e26c385d3dfc1b51923b50fd5f2ac158ee0 (diff) | |
download | mariadb-git-5b77604cc2d76bf78af113096001c21067970841.tar.gz |
merge
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b5baf7637e6..9a60cbcbf66 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -113,7 +113,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ sql_partition.h partition_info.h partition_element.h \ sql_audit.h \ contributors.h sql_servers.h sql_signal.h records.h \ - sql_prepare.h rpl_handler.h replication.h sys_vars.h + sql_prepare.h rpl_handler.h replication.h mdl.h \ + sql_plist.h transaction.h sys_vars.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ @@ -158,9 +159,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 sql_audit.cc \ - event_parse_data.cc sql_signal.cc \ - rpl_handler.cc + sql_servers.cc event_parse_data.cc sql_signal.cc \ + rpl_handler.cc mdl.cc transaction.cc sql_audit.cc nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c |