mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +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
122 lines
3.6 KiB
C
122 lines
3.6 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 <my_dir.h> /* for stat */
|
|
#include <m_string.h>
|
|
#if defined(HAVE_UTIME_H)
|
|
#include <utime.h>
|
|
#elif defined(HAVE_SYS_UTIME_H)
|
|
#include <sys/utime.h>
|
|
#elif !defined(HPUX10)
|
|
#include <time.h>
|
|
struct utimbuf {
|
|
time_t actime;
|
|
time_t modtime;
|
|
};
|
|
#endif
|
|
|
|
|
|
/*
|
|
int my_copy(const char *from, const char *to, myf MyFlags)
|
|
|
|
NOTES
|
|
Ordinary ownership and accesstimes are copied from 'from-file'
|
|
If MyFlags & MY_HOLD_ORIGINAL_MODES is set and to-file exists then
|
|
the modes of to-file isn't changed
|
|
If MyFlags & MY_DONT_OVERWRITE_FILE is set, we will give an error
|
|
if the file existed.
|
|
|
|
WARNING
|
|
Don't set MY_FNABP or MY_NABP bits on when calling this function !
|
|
|
|
RETURN
|
|
0 ok
|
|
# Error
|
|
|
|
*/
|
|
|
|
int my_copy(const char *from, const char *to, myf MyFlags)
|
|
{
|
|
uint Count;
|
|
my_bool new_file_stat= 0; /* 1 if we could stat "to" */
|
|
int create_flag;
|
|
File from_file,to_file;
|
|
uchar buff[IO_SIZE];
|
|
MY_STAT stat_buff,new_stat_buff;
|
|
DBUG_ENTER("my_copy");
|
|
DBUG_PRINT("my",("from %s to %s MyFlags %d", from, to, MyFlags));
|
|
|
|
from_file=to_file= -1;
|
|
DBUG_ASSERT(!(MyFlags & (MY_FNABP | MY_NABP))); /* for my_read/my_write */
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES) /* Copy stat if possible */
|
|
new_file_stat= test(my_stat((char*) to, &new_stat_buff, MYF(0)));
|
|
|
|
if ((from_file=my_open(from,O_RDONLY | O_SHARE,MyFlags)) >= 0)
|
|
{
|
|
if (!my_stat(from, &stat_buff, MyFlags))
|
|
{
|
|
my_errno=errno;
|
|
goto err;
|
|
}
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES && new_file_stat)
|
|
stat_buff=new_stat_buff;
|
|
create_flag= (MyFlags & MY_DONT_OVERWRITE_FILE) ? O_EXCL : O_TRUNC;
|
|
|
|
if ((to_file= my_create(to,(int) stat_buff.st_mode,
|
|
O_WRONLY | create_flag | O_BINARY | O_SHARE,
|
|
MyFlags)) < 0)
|
|
goto err;
|
|
|
|
while ((Count=my_read(from_file, buff, sizeof(buff), MyFlags)) != 0)
|
|
{
|
|
if (Count == (uint) -1 ||
|
|
my_write(to_file,buff,Count,MYF(MyFlags | MY_NABP)))
|
|
goto err;
|
|
}
|
|
|
|
if (my_close(from_file,MyFlags) | my_close(to_file,MyFlags))
|
|
DBUG_RETURN(-1); /* Error on close */
|
|
|
|
/* Copy modes if possible */
|
|
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat)
|
|
DBUG_RETURN(0); /* File copyed but not stat */
|
|
VOID(chmod(to, stat_buff.st_mode & 07777)); /* Copy modes */
|
|
#if !defined(__WIN__) && !defined(__NETWARE__)
|
|
VOID(chown(to, stat_buff.st_uid,stat_buff.st_gid)); /* Copy ownership */
|
|
#endif
|
|
#if !defined(VMS) && !defined(__ZTC__)
|
|
if (MyFlags & MY_COPYTIME)
|
|
{
|
|
struct utimbuf timep;
|
|
timep.actime = stat_buff.st_atime;
|
|
timep.modtime = stat_buff.st_mtime;
|
|
VOID(utime((char*) to, &timep)); /* last accessed and modified times */
|
|
}
|
|
#endif
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
err:
|
|
if (from_file >= 0) VOID(my_close(from_file,MyFlags));
|
|
if (to_file >= 0)
|
|
{
|
|
VOID(my_close(to_file, MyFlags));
|
|
/* attempt to delete the to-file we've partially written */
|
|
VOID(my_delete(to, MyFlags));
|
|
}
|
|
DBUG_RETURN(-1);
|
|
} /* my_copy */
|