diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
| commit | 353739fdef95fb1765dbbadf14ce1a9849a36137 (patch) | |
| tree | 4b2b7364d1e622b3b02db3fb9d0c898fb9293a87 /sql/Makefile.am | |
| parent | 9fee5866beed47b55c5196acfa1a03503a13a2d7 (diff) | |
| parent | f4444c0016c68feb3f300c4b30b886cd407f5824 (diff) | |
| download | mariadb-git-353739fdef95fb1765dbbadf14ce1a9849a36137.tar.gz | |
merge of mysql-5.5 into mysql-5.5-wl1054
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b31a6e3c3e0..b7c4bf44111 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -40,6 +40,7 @@ DTRACEFILES = filesort.o \ sql_cursor.o \ sql_delete.o \ sql_truncate.o \ + sql_reload.o \ sql_insert.o \ datadict.o \ sql_parse.o \ @@ -59,6 +60,7 @@ DTRACEFILES_DEPEND = filesort.o \ sql_cursor.o \ sql_delete.o \ sql_truncate.o \ + sql_reload.o \ sql_insert.o \ datadict.o \ sql_parse.o \ @@ -122,11 +124,11 @@ 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 \ - sql_audit.h \ + sql_audit.h sql_alter.h sql_partition_admin.h \ contributors.h sql_servers.h sql_signal.h records.h \ sql_prepare.h rpl_handler.h replication.h mdl.h \ sql_plist.h transaction.h sys_vars.h sql_truncate.h \ - datadict.h + sql_admin.h sql_reload.h datadict.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ @@ -140,10 +142,11 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ sql_connect.cc scheduler.cc sql_parse.cc \ keycaches.cc set_var.cc sql_yacc.yy sys_vars.cc \ sql_base.cc table.cc sql_select.cc sql_insert.cc \ - datadict.cc sql_profile.cc \ + sql_reload.cc datadict.cc sql_profile.cc \ sql_prepare.cc sql_error.cc sql_locale.cc \ sql_update.cc sql_delete.cc uniques.cc sql_do.cc \ - procedure.cc sql_test.cc sql_truncate.cc \ + procedure.cc sql_test.cc sql_admin.cc \ + sql_truncate.cc \ log.cc init.cc derror.cc sql_acl.cc \ unireg.cc des_key_file.cc \ log_event.cc rpl_record.cc \ @@ -171,7 +174,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ sql_builtin.cc sql_tablespace.cc partition_info.cc \ sql_servers.cc event_parse_data.cc sql_signal.cc \ rpl_handler.cc mdl.cc transaction.cc sql_audit.cc \ - sha2.cc + sql_alter.cc sql_partition_admin.cc sha2.cc nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c client_plugin.c |