diff options
| author | sasha@mysql.sashanet.com <> | 2001-08-11 19:54:31 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-08-11 19:54:31 -0600 |
| commit | 7c344a582c272deac20576f894fe56caf8fff8c3 (patch) | |
| tree | 9bf257a90e55b757a97fdd2fbc4149e054718451 /sql/Makefile.am | |
| parent | 72671338869b105063ff6372799ee6c6c7679988 (diff) | |
| download | mariadb-git-7c344a582c272deac20576f894fe56caf8fff8c3.tar.gz | |
post-merge fixes to make it compile. It still fails the fulltext test,
(wrong error code) but I'll push it so that Sergei could clean up
my merge
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index d3c3ff541fd..3456a07977d 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -80,9 +80,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.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 \ - slave.cc sql_repl.cc \ + slave.cc sql_repl.cc sql_union.cc \ mini_client.cc mini_client_errors.c \ - md5.c stacktrace.c + md5.c stacktrace.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) |