diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:39:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-09-19 14:39:11 -0600 |
| commit | 30f4ea704431158f96163e7e62ad28a98164bbbf (patch) | |
| tree | 79cfad2bba3d731b1adc961f57f00e92a10581f9 /sql/Makefile.am | |
| parent | 5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff) | |
| parent | ba2c3fcd6a4eacd1c09fbebd823c0efdeefeedac (diff) | |
| download | mariadb-git-30f4ea704431158f96163e7e62ad28a98164bbbf.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
Auto merged
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/md5.c:
Auto merged
sql/Makefile.am:
Auto merged
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 abde8b3a738..04806248cae 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -55,7 +55,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \ ha_gemini.h opt_range.h opt_ft.h \ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ - lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ + lex.h lex_symbol.h sql_acl.h sql_crypt.h \ log_event.h mini_client.h sql_repl.h slave.h \ stacktrace.h sql_sort.h mysqld_SOURCES = sql_lex.cc sql_handler.cc \ @@ -82,7 +82,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ slave.cc sql_repl.cc sql_union.cc \ mini_client.cc mini_client_errors.c \ - md5.c stacktrace.c + stacktrace.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) |