mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
123 lines
3.4 KiB
C
123 lines
3.4 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
static char *find_file_in_path(char *to,const char *name);
|
|
|
|
/* Finds where program can find it's files.
|
|
pre_pathname is found by first locking at progname (argv[0]).
|
|
if progname contains path the path is returned.
|
|
else if progname is found in path, return it
|
|
else if progname is given and POSIX environment variable "_" is set
|
|
then path is taken from "_".
|
|
If filename doesn't contain a path append MY_BASEDIR_VERSION or
|
|
MY_BASEDIR if defined, else append "/my/running".
|
|
own_path_name_part is concatinated to result.
|
|
my_path puts result in to and returns to */
|
|
|
|
char * my_path(char * to, const char *progname,
|
|
const char *own_pathname_part)
|
|
{
|
|
char *start, *end, *prog;
|
|
size_t to_length;
|
|
DBUG_ENTER("my_path");
|
|
|
|
start=to; /* Return this */
|
|
if (progname && (dirname_part(to, progname, &to_length) ||
|
|
find_file_in_path(to,progname) ||
|
|
((prog=getenv("_")) != 0 &&
|
|
dirname_part(to, prog, &to_length))))
|
|
{
|
|
VOID(intern_filename(to,to));
|
|
if (!test_if_hard_path(to))
|
|
{
|
|
if (!my_getwd(curr_dir,FN_REFLEN,MYF(0)))
|
|
bchange((uchar*) to, 0, (uchar*) curr_dir, strlen(curr_dir), strlen(to)+1);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if ((end = getenv("MY_BASEDIR_VERSION")) == 0 &&
|
|
(end = getenv("MY_BASEDIR")) == 0)
|
|
{
|
|
#ifdef DEFAULT_BASEDIR
|
|
end= (char*) DEFAULT_BASEDIR;
|
|
#else
|
|
end= (char*) "/my/";
|
|
#endif
|
|
}
|
|
VOID(intern_filename(to,end));
|
|
to=strend(to);
|
|
if (to != start && to[-1] != FN_LIBCHAR)
|
|
*to++ = FN_LIBCHAR;
|
|
VOID(strmov(to,own_pathname_part));
|
|
}
|
|
DBUG_PRINT("exit",("to: '%s'",start));
|
|
DBUG_RETURN(start);
|
|
} /* my_path */
|
|
|
|
|
|
/* test if file without filename is found in path */
|
|
/* Returns to if found and to has dirpart if found, else NullS */
|
|
|
|
#if defined(__WIN__)
|
|
#define F_OK 0
|
|
#define PATH_SEP ';'
|
|
#define PROGRAM_EXTENSION ".exe"
|
|
#elif defined(__NETWARE__)
|
|
#define PATH_SEP ';'
|
|
#define PROGRAM_EXTENSION ".nlm"
|
|
#else
|
|
#define PATH_SEP ':'
|
|
#endif
|
|
|
|
static char *find_file_in_path(char *to, const char *name)
|
|
{
|
|
char *path,*pos,dir[2];
|
|
const char *ext="";
|
|
|
|
if (!(path=getenv("PATH")))
|
|
return NullS;
|
|
dir[0]=FN_LIBCHAR; dir[1]=0;
|
|
#ifdef PROGRAM_EXTENSION
|
|
if (!fn_ext(name)[0])
|
|
ext=PROGRAM_EXTENSION;
|
|
#endif
|
|
|
|
for (pos=path ; (pos=strchr(pos,PATH_SEP)) ; path= ++pos)
|
|
{
|
|
if (path != pos)
|
|
{
|
|
strxmov(strnmov(to,path,(uint) (pos-path)),dir,name,ext,NullS);
|
|
if (!access(to,F_OK))
|
|
{
|
|
to[(uint) (pos-path)+1]=0; /* Return path only */
|
|
return to;
|
|
}
|
|
}
|
|
}
|
|
#ifdef __WIN__
|
|
to[0]=FN_CURLIB;
|
|
strxmov(to+1,dir,name,ext,NullS);
|
|
if (!access(to,F_OK)) /* Test in current dir */
|
|
{
|
|
to[2]=0; /* Leave ".\" */
|
|
return to;
|
|
}
|
|
#endif
|
|
return NullS; /* File not found */
|
|
}
|