diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:18:25 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:18:25 +0300 |
| commit | 20d04c924b824de637e18750687dccbb28eb650c (patch) | |
| tree | 10378caa2d664f34da82d58a0fbe3f17c6ad6704 /sql/Makefile.am | |
| parent | 3fc15fd38d003f456e0b7150d0bc6fca13624c4c (diff) | |
| download | mariadb-git-20d04c924b824de637e18750687dccbb28eb650c.tar.gz | |
Support for VIO library
Makefile.am:
Added vio
include/mysql_com.h:
Removed ancient defines from Vio++ times
include/violite.h:
Added vio
libmysql/Makefile.shared:
Removed sqlobject line with violite.lo
libmysql/libmysql.c:
Openssl stuff & sons
sql/Makefile.am:
Added vio
sql/mini_client.cc:
Added vio
sql/mysqld.cc:
Added vio
sql/net_serv.cc:
Added vio
sql/sql_parse.cc:
Added vio
vio/Makefile.am:
Removed C++ stuff
vio/vio.c:
st_vio -> Vio
vio/viosocket.c:
st_vio -> Vio
vio/viossl.c:
st_vio -> Vio
vio/viosslfactories.c:
vio.h-> violite.h
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..f4ff799b49b 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -39,8 +39,8 @@ LDADD = ../isam/libnisam.a \ ../mysys/libmysys.a \ ../dbug/libdbug.a \ ../regex/libregex.a \ - ../strings/libmystrings.a - #../vio/libvio.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 \ @@ -86,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 violite.c \ +mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc \ mini_client_errors.c password.c mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD) |