diff options
| author | andrey@lmy004. <> | 2006-01-11 12:01:36 +0100 |
|---|---|---|
| committer | andrey@lmy004. <> | 2006-01-11 12:01:36 +0100 |
| commit | 8515610f2ed1bb9e6073ffef67fa52586afeffdf (patch) | |
| tree | bdae416c995fa909938346e38c2f7252848f05d3 /libmysqld | |
| parent | cda83534b108bc9362f8ecb7ffc6fcc9a682bc45 (diff) | |
| parent | 161645c81e34a11eade160592bffd554fde7aa0c (diff) | |
| download | mariadb-git-8515610f2ed1bb9e6073ffef67fa52586afeffdf.tar.gz | |
manual merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 2b28a875137..1aad198d7ae 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -63,8 +63,10 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \ spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ - parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc event_executor.cc event.cc event_timed.cc \ - rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc + parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ + event_executor.cc event.cc event_timed.cc \ + rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \ + sql_tablespace.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \ |