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 /libmysqld/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 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index e2521bfcac7..bfbe02f9339 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -63,7 +63,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ protocol.cc net_serv.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ sql_load.cc discover.cc sql_locale.cc \ - sql_profile.cc sql_truncate.cc datadict.cc \ + sql_profile.cc sql_admin.cc sql_truncate.cc datadict.cc \ + sql_reload.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ sql_lex.cc sql_list.cc sql_manager.cc \ @@ -78,9 +79,10 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ debug_sync.cc sql_tablespace.cc transaction.cc \ - rpl_injector.cc my_user.c partition_info.cc \ + rpl_injector.cc my_user.c partition_info.cc sql_alter.cc \ sql_servers.cc event_parse_data.cc sql_signal.cc \ - rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc + rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \ + sql_partition_admin.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) |