mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +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
129 lines
2.9 KiB
C
129 lines
2.9 KiB
C
/* Copyright (C) 2004 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 */
|
|
|
|
/* get hardware address for an interface */
|
|
/* if there are many available, any non-zero one can be used */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
#if !defined(__FreeBSD__) || defined(__linux__)
|
|
static my_bool memcpy_and_test(uchar *to, uchar *from, uint len)
|
|
{
|
|
uint i, res=1;
|
|
|
|
for (i=0; i < len; i++)
|
|
if ((*to++= *from++))
|
|
res=0;
|
|
return res;
|
|
}
|
|
|
|
#ifdef __FreeBSD__
|
|
|
|
#include <net/ethernet.h>
|
|
#include <sys/sysctl.h>
|
|
#include <net/route.h>
|
|
#include <net/if.h>
|
|
#include <net/if_dl.h>
|
|
|
|
my_bool my_gethwaddr(uchar *to)
|
|
{
|
|
size_t len;
|
|
uchar *buf, *next, *end, *addr;
|
|
struct if_msghdr *ifm;
|
|
struct sockaddr_dl *sdl;
|
|
int i, res=1, mib[6]={CTL_NET, AF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0};
|
|
|
|
if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1)
|
|
goto err;
|
|
if (!(buf = alloca(len)))
|
|
goto err;
|
|
if (sysctl(mib, 6, buf, &len, NULL, 0) < 0)
|
|
goto err;
|
|
|
|
end = buf + len;
|
|
|
|
for (next = buf ; res && next < end ; next += ifm->ifm_msglen)
|
|
{
|
|
ifm = (struct if_msghdr *)next;
|
|
if (ifm->ifm_type == RTM_IFINFO)
|
|
{
|
|
sdl = (struct sockaddr_dl *)(ifm + 1);
|
|
addr=LLADDR(sdl);
|
|
res=memcpy_and_test(to, addr, ETHER_ADDR_LEN);
|
|
}
|
|
}
|
|
|
|
err:
|
|
return res;
|
|
}
|
|
|
|
#elif __linux__
|
|
|
|
#include <net/if.h>
|
|
#include <sys/ioctl.h>
|
|
#include <net/ethernet.h>
|
|
|
|
my_bool my_gethwaddr(uchar *to)
|
|
{
|
|
int fd, res=1;
|
|
struct ifreq ifr;
|
|
|
|
fd = socket(AF_INET, SOCK_DGRAM, 0);
|
|
if (fd < 0)
|
|
goto err;
|
|
|
|
bzero(&ifr, sizeof(ifr));
|
|
strnmov(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
|
|
|
|
do {
|
|
if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
|
|
res=memcpy_and_test(to, (uchar *)&ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
|
|
} while (res && (errno == 0 || errno == ENODEV) && ifr.ifr_name[3]++ < '6');
|
|
|
|
close(fd);
|
|
err:
|
|
return res;
|
|
}
|
|
|
|
#else
|
|
/* just fail */
|
|
my_bool my_gethwaddr(uchar *to __attribute__((unused)))
|
|
{
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#else /* MAIN */
|
|
int main(int argc __attribute__((unused)),char **argv)
|
|
{
|
|
uchar mac[6];
|
|
uint i;
|
|
MY_INIT(argv[0]);
|
|
if (my_gethwaddr(mac))
|
|
{
|
|
printf("my_gethwaddr failed with errno %d\n", errno);
|
|
exit(1);
|
|
}
|
|
for (i=0; i < sizeof(mac); i++)
|
|
{
|
|
if (i) printf(":");
|
|
printf("%02x", mac[i]);
|
|
}
|
|
printf("\n");
|
|
return 0;
|
|
}
|
|
#endif
|
|
|