mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
59806e1004
Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Delete: mysql-test/include/have_openssl_2.inc BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Delete: mysql-test/r/have_openssl_2.require BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Delete: mysql-test/t/openssl_2.test BitKeeper/etc/ignore: added libmysql/vio_priv.h libmysql_r/vio_priv.h client/mysql.cc: vio ssl structure renames include/violite.h: Cleanup violite.h interface (move things to vio_priv.h) libmysql/Makefile.am: Use vio_priv.h libmysql/Makefile.shared: Use vio_priv.h libmysqld/lib_vio.c: Added timeout for windows mysys/my_getopt.c: Indentaion cleanup sql/item_cmpfunc.cc: Remove compiler warnings sql/item_func.cc: Remove compiler warnings sql/mini_client.cc: vio ssl structure renames sql/mysqld.cc: Check on windows if second server is started with same TCP/IP port sql/net_serv.cc: Add read/write timeouts for windows sql/sql_acl.cc: vio ssl structure renames sql/sql_show.cc: vio ssl structure renames vio/vio.c: Added timeouts for windows vio/viosocket.c: Added timeouts for windows vio/viossl.c: Added timeouts for windows Cleaned up structure element names vio/viosslfactories.c: Added timeouts for windows Cleaned up structure element names
103 lines
4.1 KiB
Text
103 lines
4.1 KiB
Text
## Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
##
|
|
## This library is free software; you can redistribute it and/or
|
|
## modify it under the terms of the GNU Library General Public
|
|
## License as published by the Free Software Foundation; either
|
|
## version 2 of the License, or (at your option) any later version.
|
|
##
|
|
## This library is distributed in the hope that it will be useful,
|
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
## Library General Public License for more details.
|
|
##
|
|
## You should have received a copy of the GNU Library General Public
|
|
## License along with this library; if not, write to the Free
|
|
## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
## MA 02111-1307, USA
|
|
##
|
|
## This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded
|
|
## until someone complains that they need separate options.
|
|
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target)
|
|
pkglib_LTLIBRARIES = $(target)
|
|
|
|
noinst_PROGRAMS = conf_to_src
|
|
|
|
# We need .lo, not .o files for everything.
|
|
CHARSET_OBJS=@CHARSET_OBJS@
|
|
LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo}
|
|
|
|
target_sources = libmysql.c password.c manager.c \
|
|
get_password.c errmsg.c
|
|
|
|
mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \
|
|
strmake.lo strend.lo \
|
|
strnlen.lo strfill.lo is_prefix.lo \
|
|
int2str.lo str2int.lo strinstr.lo strcont.lo \
|
|
strcend.lo bcmp.lo \
|
|
bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
|
|
strtoull.lo strtoll.lo llstr.lo \
|
|
ctype.lo $(LTCHARSET_OBJS)
|
|
mystringsextra= strto.c
|
|
mystringsgen= ctype_autoconf.c
|
|
dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
|
|
mysysheaders = mysys_priv.h my_static.h
|
|
vioheaders = vio_priv.h
|
|
mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
|
|
my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \
|
|
mf_casecnv.lo my_read.lo my_write.lo errors.lo \
|
|
my_error.lo my_getwd.lo my_div.lo \
|
|
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
|
|
mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
|
|
mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
|
|
my_symlink.lo my_fstream.lo \
|
|
mf_loadpath.lo my_pthread.lo my_thr_init.lo \
|
|
thr_mutex.lo mulalloc.lo string.lo default.lo \
|
|
my_compress.lo array.lo my_once.lo list.lo my_net.lo \
|
|
charset.lo hash.lo mf_iocache.lo \
|
|
mf_iocache2.lo my_seek.lo my_sleep.lo \
|
|
my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo \
|
|
my_getopt.lo my_gethostbyname.lo my_port.lo
|
|
sqlobjects = net.lo
|
|
|
|
# Not needed in the minimum library
|
|
mysysobjects2 = my_lib.lo
|
|
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
|
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
|
|
$(vio_objects) $(sqlobjects)
|
|
target_ldflags = -version-info @SHARED_LIB_VERSION@
|
|
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
|
|
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
|
$(target)
|
|
DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
|
|
|
|
# The automatic dependencies miss this
|
|
bmove_upp.lo: $(LTCHARSET_OBJS)
|
|
ctype.lo: ctype_extra_sources.c
|
|
|
|
clean-local:
|
|
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
|
|
`echo $(vio_objects) | sed "s;\.lo;.c;g"` \
|
|
$(CHARSET_SRCS) $(CHARSET_OBJS) \
|
|
$(mystringsextra) $(mystringsgen) $(mysysheaders) $(vioheaders)\
|
|
ctype_extra_sources.c net.c ../linked_client_sources
|
|
|
|
ctype_extra_sources.c: conf_to_src
|
|
./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \
|
|
$(srcdir)/ctype_extra_sources.c
|
|
conf_to_src_SOURCES = conf_to_src.c
|
|
conf_to_src_LDADD=
|
|
#force static linking of conf_to_src - essential when linking against
|
|
#custom installation of libc
|
|
conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|