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)\""
|
2004-04-26 22:37:42 +02: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 \
|
|
|
|
|
$(openssl_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
|
2003-06-17 21:32:31 +05:00
|
|
|
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.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 \
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 10:11:31 +04:00
|
|
|
spatial.cc gstream.cc sql_help.cc tztime.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 \
|
2004-04-26 22:37:42 +02:00
|
|
|
@innodb_libs@ @bdb_libs_with_path@ \
|
2001-10-08 04:58:07 +03:00
|
|
|
$(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.%
|