mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
b59217ebbb
--long-query-time is now given in seconds with microseconds as decimals --min_examined_row_limit added for slow query log long_query_time user variable is now double with 6 decimals Added functions to get time in microseconds Added faster time() functions for system that has gethrtime() (Solaris) We now do less time() calls. Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers set_var.cc and my_getopt() can now handle DOUBLE variables. All time() calls changed to my_time() my_time() now does retry's if time() call fails. Added debug function for stopping in mysql_admin_table() when tables are locked Some trivial function and struct variable renames to avoid merge errors. Fixed compiler warnings Initialization of some time variables on windows moved to my_init() include/my_getopt.h: Added support for double arguments include/my_sys.h: Fixed wrong type to packfrm() Added new my_time functions include/mysql/plugin.h: Added support for DOUBLE libmysql/CMakeLists.txt: Added new time functions libmysql/Makefile.shared: Added new time functions mysql-test/r/variables.result: Testing of long_query_time mysql-test/t/variables.test: Testing of long_query_time mysys/charset.c: Fixed compiler warnings mysys/default_modify.c: Fixed compiler warnings mysys/hash.c: Fixed compiler warnings mysys/mf_getdate.c: Use my_time() mysys/mf_iocache2.c: Fixed compiler warnings mysys/mf_pack.c: Fixed compiler warnings mysys/mf_path.c: Fixed compiler warnings mysys/my_append.c: Fixed compiler warnings mysys/my_compress.c: Fixed compiler warnings mysys/my_copy.c: Fixed compiler warnings mysys/my_gethwaddr.c: Fixed compiler warnings mysys/my_getopt.c: Added support for double arguments mysys/my_getsystime.c: Added functions to get time in microseconds. Added faster time() functions for system that has gethrtime() (Solaris) Moved windows initialization code to my_init() mysys/my_init.c: Added initializing of variables needed for windows time functions mysys/my_static.c: Added variables needed for windows time functions mysys/my_static.h: Added variables needed for windows time functions mysys/my_thr_init.c: Added THR_LOCK_time, used for faster my_time() mysys/mysys_priv.h: Added THR_LOCK_time, used for faster my_time() mysys/thr_alarm.c: time() -> my_time() sql/event_data_objects.cc: end_time() -> set_current_time() sql/event_queue.cc: end_time() -> set_current_time() sql/event_scheduler.cc: Fixed compiler warnings sql/field.h: Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers sql/item.h: Added decimal to Item_float(double) sql/item_cmpfunc.h: Added decimal to Item_float(double) sql/item_timefunc.cc: time() -> my_time() sql/item_xmlfunc.cc: Fixed compiler warning sql/lock.cc: lock_time() -> set_time_after_lock() sql/log.cc: Timing in slow query log to file is now done in microseconds Changed some while() loops to for() loops. Fixed indentation time() -> my_time() sql/log.h: Slow query logging is now done based on microseconds sql/log_event.cc: time() -> my_time() Fixed arguments to new Item_float() sql/mysql_priv.h: Fixed compiler warnings Added opt_log_slow_slave_statements sql/mysqld.cc: Added --log_slow_slave_statements and --min_examined_row_limit --long-query-time now takes a double argument with microsecond resolution Don't write shutdown message when using --help Removed not needed \n Thread create time and connect time is now done in microseconds time() -> my_time() Avoid some time() calls sql/net_serv.cc: Fixed compiler warnings sql/parse_file.cc: time() -> my_time() sql/set_var.cc: Added support for DOUBLE variables Added support for variables that are given in seconds with microsecond resolution sql/set_var.h: Added support for variables that are given in seconds with microsecond resolution sql/slave.cc: Allow logging of slave queries to slow query log if 'opt_log_slow_slave_statements' is given time() -> my_time() sql/sql_cache.h: Fixed compiler warning() sql/sql_class.cc: Initialize new THD variables sql/sql_class.h: long_query_time is now in microseconds Added min_examined_row_limit Reordered some THD elements for higher efficency Added timers in microseconds (connect_utime, thr_create_utime, start_utime and utime_after_lock) Start of query is now recorded both in seconds and in microseconds. Following renames was made for more clarity and avoid merge problems from earlier versions: connect_time -> connect_utime thr_create_time -> thr_create_utime end_time() -> set_current_time() lock_time() -> set_time_after_lock() Added THD::start_utime, which is start of query in microseconds from some arbitary time Added function THD::current_utime() Removed safe_time() as retry's are handled in my_time() sql/sql_connect.cc: User resources are now using microsecond resolution sql/sql_insert.cc: end_time() -> set_current_time() sql-common/client.c: time() -> my_time() sql/sql_parse.cc: Testing if we should print to slow_query_log() is now done with microsecond precission. If min_examined_row_limit is given, only log queries to slow query log that has examined more rows than this. sql/sql_select.cc: Simplify code now that Item_float() takes decimals as argument sql/sql_show.cc: time() -> my_time() Added support for SYS_DOUBLE sql/sql_table.cc: Added debug function for stopping in mysql_admin_table() when tables are locked sql/structs.h: intime -> reset_utime
119 lines
4.7 KiB
Text
119 lines
4.7 KiB
Text
# Copyright (C) 2000-2004 MySQL AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of version 2 GNU General Public License as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# There are special exceptions to the terms and conditions of the GPL as it
|
|
# is applied to this software. View the full text of the exception in file
|
|
# EXCEPTIONS-CLIENT in the directory of this software distribution.
|
|
#
|
|
# 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
|
|
|
|
|
|
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 strtod.lo \
|
|
strnlen.lo strfill.lo is_prefix.lo \
|
|
int2str.lo str2int.lo strinstr.lo strcont.lo \
|
|
strcend.lo bcmp.lo ctype-latin1.lo \
|
|
bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
|
|
strtoull.lo strtoll.lo llstr.lo my_vsnprintf.lo \
|
|
ctype.lo ctype-simple.lo ctype-bin.lo ctype-mb.lo \
|
|
ctype-big5.lo ctype-czech.lo ctype-cp932.lo ctype-eucjpms.lo ctype-euc_kr.lo \
|
|
ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \
|
|
ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \
|
|
ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \
|
|
ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.lo
|
|
|
|
mystringsextra= strto.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 \
|
|
my_file.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 default_modify.lo \
|
|
my_compress.lo array.lo my_once.lo list.lo my_net.lo \
|
|
charset.lo charset-def.lo hash.lo mf_iocache.lo \
|
|
mf_iocache2.lo my_seek.lo my_sleep.lo \
|
|
my_pread.lo mf_cache.lo md5.lo sha1.lo \
|
|
my_getopt.lo my_gethostbyname.lo my_port.lo \
|
|
my_rename.lo my_chsize.lo my_getsystime.lo
|
|
sqlobjects = net.lo
|
|
sql_cmn_objects = pack.lo client.lo my_time.lo
|
|
|
|
# Not needed in the minimum library
|
|
mysysobjects2 = my_lib.lo
|
|
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
|
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
|
|
$(sql_cmn_objects) $(vio_objects) $(sqlobjects)
|
|
target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@
|
|
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
|
|
|
|
BUILT_SOURCES = link_sources
|
|
|
|
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
|
$(target) $(BUILT_SOURCES)
|
|
DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DDEFAULT_HOME_ENV=MYSQL_HOME \
|
|
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
|
|
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
|
|
|
|
if HAVE_YASSL
|
|
yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \
|
|
$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
|
|
endif
|
|
|
|
# The automatic dependencies miss this
|
|
#bmove_upp.lo: $(LTCHARSET_OBJS)
|
|
|
|
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"` \
|
|
`echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \
|
|
$(CHARSET_SRCS) $(CHARSET_OBJS) \
|
|
$(mystringsextra) $(mysysheaders) $(vioheaders) \
|
|
net.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.%
|