diff options
| author | serg@serg.mysql.com <> | 2001-07-02 21:52:22 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-07-02 21:52:22 +0200 |
| commit | 004313688277d2f079750c191eda748874a3cc31 (patch) | |
| tree | b02cd20fcbc632447cd4b10782204969c9e6af34 /sql/Makefile.am | |
| parent | 15b6738474fd9df56c4aff8f984278cd374bd3f3 (diff) | |
| parent | 9e9f21a5c9832e783eccd76499ba1472a4feed3d (diff) | |
| download | mariadb-git-004313688277d2f079750c191eda748874a3cc31.tar.gz | |
merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index c4ed5c05cd3..70415be03a4 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -36,11 +36,11 @@ LDADD = ../isam/libnisam.a \ ../myisam/libmyisam.a \ ../myisammrg/libmyisammrg.a \ ../heap/libheap.a \ + ../vio/libvio.a \ ../mysys/libmysys.a \ ../dbug/libdbug.a \ ../regex/libregex.a \ ../strings/libmystrings.a - #../vio/libvio.a mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ @@ -64,7 +64,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ thr_malloc.cc item_create.cc \ field.cc key.cc sql_class.cc sql_list.cc \ - net_serv.cc violite.c net_pkg.cc lock.cc my_lock.c \ + net_serv.cc net_pkg.cc lock.cc my_lock.c \ sql_string.cc sql_manager.cc sql_map.cc \ mysqld.cc password.c hash_filo.cc hostname.cc \ convert.cc sql_parse.cc sql_yacc.yy \ @@ -83,10 +83,10 @@ 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 \ mini_client.cc mini_client_errors.c \ - md5.c stacktrace.c + md5.c stacktrace.c sql_unions.cc gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) -mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc violite.c \ +mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc \ mini_client_errors.c password.c mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD) |