2001-04-11 13:04:03 +02:00
|
|
|
# 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
|
|
|
|
|
2001-10-08 04:58:07 +03:00
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
|
|
MYSQLBASEdir= $(prefix)
|
2001-04-11 13:04:03 +02:00
|
|
|
|
|
|
|
DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
|
|
|
|
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
|
|
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\""
|
2002-11-26 14:01:08 +01:00
|
|
|
INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
|
2003-08-19 00:08:08 +03:00
|
|
|
-I$(top_srcdir)/sql -I$(top_srcdir)/regex \
|
WL#1518, "make bundled zlib usable for unix builds":
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts
like AIX52 or HPUX11, where such a check is possible. It didn't compile
there before as these systems dont't have installed zlib, so nothing got broken ;)
Makefile.am:
WL#1518 "make bundled zlib usable for unix builds", part 2:
- zlib dir should be built only if there is no system zlib available;
with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered
if make dist
acinclude.m4:
WL#1518, "make bundled zlib usable for unix builds":
- actual implementation of the check for various zlib usage options
configure.in:
WL#1518, "make bundled zlib usable for unix builds":
- MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed
libmysql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysql_r/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
libmysqld/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
myisam/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib binary dir added
mysys/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
sql/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir and library dir added
tools/Makefile.am:
WL#1518, "make bundled zlib usable for unix builds":
- support for non-standard zlib include dir added
- copyright added
2004-07-24 03:30:11 -07:00
|
|
|
$(openssl_includes) @ZLIB_INCLUDES@
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2001-10-08 04:58:07 +03:00
|
|
|
noinst_LIBRARIES = libmysqld_int.a
|
|
|
|
pkglib_LIBRARIES = libmysqld.a
|
2001-09-18 06:05:55 +03:00
|
|
|
SUBDIRS = . examples
|
2003-12-01 17:19:10 +04:00
|
|
|
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
|
Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
VC++Files/libmysql/libmysql.dsp:
new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
new file: my_time.c
VC++Files/sql/mysqld.dsp:
new file: my_time.c
include/Makefile.am:
- mysql_time.h added to the list of installed client library headers
include/mysql.h:
- declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to
mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
- my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
Fix for bug#4030 "Client side conversion string -> date type doesn't work
(prepared statements)" and cleanup.
- added case labels for TIME/DATE/DATETIME types to send_data_str
- comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
- my_time.c added
sql-common/Makefile.am:
- my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
my_time.c added to the list of mysqld sources.
sql/field.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
- added typedefs for TIME and timestamp_type
- removed declarations for str_to_time and str_to_TIME (now this functions
reside in mysys)
sql/mysqld.cc:
- log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
- enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
- fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
- TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
- embedded library implementation of set_param_{time,date,datetime} is
much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
- s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
- declarations for TIME and timestamp_type replaced with typedefs
- str_to_datetime arguments moved to mysys headers
sql/time.cc:
- str_to_time and str_to_TIME moved to mysys
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
exported to client.
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
- a test case for Bug#4030 "Client side conversion string -> date type
doesn't work (prepared statements)"
2004-06-24 19:08:36 +04:00
|
|
|
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
|
|
|
|
my_time.c
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2003-12-01 17:19:10 +04:00
|
|
|
noinst_HEADERS = embedded_priv.h emb_qcache.h
|
2001-10-02 05:53:00 +03:00
|
|
|
|
2003-11-03 14:01:59 +02:00
|
|
|
sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
2002-01-16 00:42:52 +02:00
|
|
|
ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \
|
2001-04-25 01:11:29 +03:00
|
|
|
ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
|
2003-03-18 22:14:02 +01:00
|
|
|
hostname.cc init.cc password.c \
|
2001-04-11 13:04:03 +02:00
|
|
|
item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
|
|
|
|
item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
|
2003-05-30 15:22:34 +05:00
|
|
|
item_geofunc.cc item_uniq.cc item_subselect.cc item_row.cc\
|
2003-06-05 00:12:45 +03:00
|
|
|
key.cc lock.cc log.cc log_event.cc sql_state.c \
|
2004-02-03 14:35:24 +04:00
|
|
|
protocol.cc net_serv.cc opt_range.cc \
|
2001-10-11 05:37:05 +03:00
|
|
|
opt_sum.cc procedure.cc records.cc sql_acl.cc \
|
2004-05-25 22:08:59 +03:00
|
|
|
sql_load.cc discover.cc \
|
2001-04-11 13:04:03 +02:00
|
|
|
sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
|
2002-06-14 15:08:50 -07:00
|
|
|
sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
|
|
|
|
sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \
|
2003-05-02 21:07:41 +05:00
|
|
|
sql_prepare.cc sql_derived.cc sql_rename.cc \
|
2002-08-30 12:40:40 +03:00
|
|
|
sql_select.cc sql_do.cc sql_show.cc set_var.cc \
|
2001-04-11 13:04:03 +02:00
|
|
|
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
|
|
|
|
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
|
2002-02-22 15:24:42 +04:00
|
|
|
unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
|
2004-07-07 11:29:39 +03:00
|
|
|
spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
|
2004-05-11 23:23:49 +03:00
|
|
|
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
|
2004-09-10 10:29:08 +04:00
|
|
|
parse_file.cc sql_view.cc sql_trigger.cc
|
2001-04-11 13:04:03 +02:00
|
|
|
|
2001-10-08 04:58:07 +03:00
|
|
|
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
|
2001-10-08 23:20:19 +03:00
|
|
|
libmysqld_a_SOURCES=
|
2001-10-08 04:58:07 +03:00
|
|
|
|
2001-04-11 13:04:03 +02:00
|
|
|
# automake misses these
|
|
|
|
sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
|
|
|
|
|
2001-10-08 04:58:07 +03:00
|
|
|
# The following libraries should be included in libmysqld.a
|
|
|
|
INC_LIB= $(top_builddir)/regex/libregex.a \
|
|
|
|
$(top_builddir)/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/myisammrg/libmyisammrg.a \
|
|
|
|
$(top_builddir)/heap/libheap.a \
|
|
|
|
@innodb_libs@ @bdb_libs_with_path@ \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
2003-06-17 21:32:31 +05:00
|
|
|
$(top_builddir)/vio/libvio.a
|
2001-10-08 04:58:07 +03:00
|
|
|
|
|
|
|
#
|
2004-05-25 22:00:14 +03:00
|
|
|
# To make it easy for the end user to use the embedded library we
|
|
|
|
# generate a total libmysqld.a from all library files,
|
2001-10-08 04:58:07 +03:00
|
|
|
|
|
|
|
libmysqld.a: libmysqld_int.a $(INC_LIB)
|
2004-05-25 22:00:14 +03:00
|
|
|
if test "$(host_os)" = "netware" ; \
|
|
|
|
then \
|
|
|
|
$(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
|
|
|
|
else \
|
|
|
|
if test ! -d tmp ; then mkdir tmp ; fi ; \
|
|
|
|
rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a ; \
|
|
|
|
cp $(INC_LIB) tmp ; \
|
|
|
|
cp libmysqld_int.a libmysqld_int2.a ; \
|
|
|
|
cd tmp ; \
|
|
|
|
for file in *.a ; do \
|
|
|
|
bfile=`basename $$file .a` ; \
|
2004-05-25 22:54:00 +03:00
|
|
|
$(AR) x $$file; \
|
2004-05-25 22:00:14 +03:00
|
|
|
for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
|
2004-05-25 22:54:00 +03:00
|
|
|
$(AR) q ../libmysqld_int2.a *.o ; \
|
2004-05-25 22:00:14 +03:00
|
|
|
rm -f *.o ; \
|
|
|
|
done ; \
|
|
|
|
cd .. ; \
|
|
|
|
mv libmysqld_int2.a libmysqld.a ; \
|
|
|
|
rm -f tmp/* ; \
|
|
|
|
$(RANLIB) libmysqld.a ; \
|
|
|
|
fi
|
|
|
|
|
2001-10-08 04:58:07 +03:00
|
|
|
|
2001-04-11 13:04:03 +02:00
|
|
|
## XXX: any time the client interface changes, we'll need to bump
|
|
|
|
## the version info for libmysqld; however, it's possible for the
|
|
|
|
## libmysqld interface to change without affecting the standard
|
|
|
|
## libmysqlclient interface. Should we make a separate version
|
|
|
|
## string for the two?
|
2001-10-08 04:58:07 +03:00
|
|
|
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
|
|
|
|
#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
|
2001-04-11 13:04:03 +02:00
|
|
|
|
|
|
|
# This is called from the toplevel makefile
|
|
|
|
link_sources:
|
|
|
|
set -x; \
|
|
|
|
for f in $(sqlsources); do \
|
|
|
|
rm -f $(srcdir)/$$f; \
|
|
|
|
@LN_CP_F@ $(srcdir)/../sql/$$f $(srcdir)/$$f; \
|
|
|
|
done; \
|
|
|
|
for f in $(libmysqlsources); do \
|
|
|
|
rm -f $(srcdir)/$$f; \
|
|
|
|
@LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \
|
2003-06-17 21:32:31 +05:00
|
|
|
done; \
|
2003-07-14 16:38:51 +05:00
|
|
|
rm -f $(srcdir)/client_settings.h; \
|
2003-06-17 21:32:31 +05:00
|
|
|
@LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h;
|
|
|
|
|
2001-04-11 13:04:03 +02:00
|
|
|
|
|
|
|
clean-local:
|
|
|
|
rm -f `echo $(sqlsources) $(libmysqlsources) | sed "s;\.lo;.c;g"` \
|
2003-06-17 21:32:31 +05:00
|
|
|
$(top_srcdir)/linked_libmysqld_sources; \
|
|
|
|
rm -f client_settings.h
|
2001-04-11 13:04:03 +02:00
|
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
|
|
%::SCCS/s.%
|