summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-05-24 01:36:55 +0300
committerunknown <monty@donna.mysql.fi>2001-05-24 01:36:55 +0300
commit5ec74dda9bb5970f8fbba559e47c19a2b6e91561 (patch)
tree553899b2ee07d3722f3d7e8f030b86c2f97cea91 /sql/Makefile.am
parentf19c8463254b759d4e90b5439f5bde130f998bfd (diff)
downloadmariadb-git-5ec74dda9bb5970f8fbba559e47c19a2b6e91561.tar.gz
Removed vio because it broke compilation
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 218ff6bbd73..c4ed5c05cd3 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -39,8 +39,9 @@ LDADD = ../isam/libnisam.a \
../mysys/libmysys.a \
../dbug/libdbug.a \
../regex/libregex.a \
- ../vio/libvio.a \
../strings/libmystrings.a
+ #../vio/libvio.a
+
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@bdb_libs@ @innodb_libs@ @pstack_libs@ \
@gemini_libs@ \
@@ -63,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 net_pkg.cc lock.cc my_lock.c \
+ net_serv.cc violite.c 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 \
@@ -85,7 +86,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
md5.c stacktrace.c
gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
-mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc \
+mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc violite.c \
mini_client_errors.c password.c
mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD)