diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-03-20 15:01:47 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-03-20 15:01:47 +0300 |
| commit | 7df026676b6d845cc0ed7a7437995c3019a5f42d (patch) | |
| tree | dc051ac4712ac159b52fc2b48e5dd918cbc39799 /sql/Makefile.am | |
| parent | f59d1dcf0acc12c482c28c902a0030f12ba263af (diff) | |
| parent | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (diff) | |
| download | mariadb-git-7df026676b6d845cc0ed7a7437995c3019a5f42d.tar.gz | |
Merge MariaDB-5.2 -> MariaDB 5.3
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 2833fb487c9..c705914df8c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -49,7 +49,7 @@ mysqld_LDADD = libndb.la \ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h \ - item_xmlfunc.h \ + item_xmlfunc.h sql_plugin_services.h \ item_create.h item_subselect.h item_row.h \ mysql_priv.h item_geofunc.h sql_bitmap.h \ procedure.h sql_class.h sql_lex.h sql_list.h \ @@ -59,6 +59,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ ha_ndbcluster.h ha_ndbcluster_cond.h \ ha_ndbcluster_binlog.h ha_ndbcluster_tables.h \ ha_partition.h rpl_constants.h \ + debug_sync.h \ opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \ opt_subselect.h \ rpl_reporting.h \ @@ -107,6 +108,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ opt_sum.cc \ records.cc filesort.cc handler.cc \ ha_partition.cc \ + debug_sync.cc \ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ |