diff options
| author | unknown <brian@zim.(none)> | 2005-03-25 14:12:46 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-03-25 14:12:46 -0800 |
| commit | 2c353624fb781ba89806be8fe78461cd565cc7e7 (patch) | |
| tree | de43897030ade96672b1f13edc100261d0ffcc4e /libmysqld | |
| parent | e3528e0d1cd7e36158db09c0d50894a48df9f3bf (diff) | |
| parent | 0310e2a770680593de3b4724d08d6836455b3d91 (diff) | |
| download | mariadb-git-2c353624fb781ba89806be8fe78461cd565cc7e7.tar.gz | |
fixed conflict making embedded server with libmysqld
libmysqld/Makefile.am:
Fixed conflict
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 57a235730be..5d3b365042f 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -62,7 +62,8 @@ 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 protocol_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 + parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ + ha_blackhole.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources) libmysqld_a_SOURCES= |