mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
84f81dc593
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
205 lines
4.8 KiB
C
205 lines
4.8 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/* Resolves IP's to hostname and hostnames to IP's */
|
|
|
|
#define RESOLVE_VERSION "2.3"
|
|
|
|
#include <my_global.h>
|
|
#include <m_ctype.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#ifndef HAVE_BROKEN_NETINET_INCLUDES
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#include <my_net.h>
|
|
#include <my_getopt.h>
|
|
|
|
#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
|
|
extern int h_errno;
|
|
#endif
|
|
|
|
|
|
static my_bool silent;
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"help", '?', "Displays this help and exits.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"info", 'I', "Synonym for --help",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"silent", 's', "Be more silent.", (gptr*) &silent, (gptr*) &silent,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"version", 'V', "Displays version information and exits.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
|
|
static void print_version(void)
|
|
{
|
|
printf("%s Ver %s, for %s (%s)\n",my_progname,RESOLVE_VERSION,
|
|
SYSTEM_TYPE,MACHINE_TYPE);
|
|
}
|
|
|
|
|
|
static void usage(void)
|
|
{
|
|
print_version();
|
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
|
puts("Get hostname based on IP-address or IP-address based on hostname.\n");
|
|
printf("Usage: %s [OPTIONS] hostname or IP-address\n",my_progname);
|
|
my_print_help(my_long_options);
|
|
my_print_variables(my_long_options);
|
|
}
|
|
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
char *argument __attribute__((unused)))
|
|
{
|
|
switch (optid) {
|
|
case 'V': print_version(); exit(0);
|
|
case 'I':
|
|
case '?':
|
|
usage();
|
|
exit(0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*static my_string load_default_groups[]= { "resolveip","client",0 }; */
|
|
|
|
static int get_options(int *argc,char ***argv)
|
|
{
|
|
int ho_error;
|
|
|
|
/* load_defaults("my",load_default_groups,argc,argv); */
|
|
|
|
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
|
|
exit(ho_error);
|
|
|
|
if (*argc == 0)
|
|
{
|
|
usage();
|
|
return 1;
|
|
}
|
|
return 0;
|
|
} /* get_options */
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
struct hostent *hpaddr;
|
|
u_long taddr;
|
|
char *ip,**q;
|
|
int error=0;
|
|
|
|
MY_INIT(argv[0]);
|
|
|
|
if (get_options(&argc,&argv))
|
|
exit(1);
|
|
|
|
while (argc--)
|
|
{
|
|
ip = *argv++;
|
|
|
|
if (isdigit(ip[0]))
|
|
{
|
|
taddr = inet_addr(ip);
|
|
if (taddr == htonl(INADDR_BROADCAST))
|
|
{
|
|
puts("Broadcast");
|
|
continue;
|
|
}
|
|
if (taddr == htonl(INADDR_ANY))
|
|
{
|
|
if (!taddr)
|
|
puts("Null-IP-Addr");
|
|
else
|
|
puts("Old-Bcast");
|
|
continue;
|
|
}
|
|
|
|
hpaddr = gethostbyaddr((char*) &(taddr), sizeof(struct in_addr),AF_INET);
|
|
if (hpaddr)
|
|
{
|
|
if (silent)
|
|
puts(hpaddr->h_name);
|
|
else
|
|
{
|
|
printf ("Host name of %s is %s", ip,hpaddr->h_name);
|
|
#ifndef __NETWARE__
|
|
/* this information is not available on NetWare */
|
|
for (q = hpaddr->h_aliases; *q != 0; q++)
|
|
(void) printf(", %s", *q);
|
|
#endif /* __NETWARE__ */
|
|
puts("");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
error=2;
|
|
fprintf(stderr,"%s: Unable to find hostname for '%s'\n",my_progname,
|
|
ip);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
hpaddr = gethostbyname(ip);
|
|
if (!hpaddr)
|
|
{
|
|
const char *err;
|
|
fprintf(stderr,"%s: Unable to find hostid for '%s'",my_progname,ip);
|
|
switch (h_errno) {
|
|
case HOST_NOT_FOUND: err="host not found"; break;
|
|
case TRY_AGAIN: err="try again"; break;
|
|
case NO_RECOVERY: err="no recovery"; break;
|
|
case NO_DATA: err="no_data"; break;
|
|
default: err=0;
|
|
}
|
|
if (err)
|
|
fprintf(stderr,": %s\n",err);
|
|
else
|
|
fprintf(stderr,"\n");
|
|
error=2;
|
|
}
|
|
else if (silent)
|
|
{
|
|
struct in_addr in;
|
|
memcpy((char*) &in.s_addr, (char*) *hpaddr->h_addr_list,
|
|
sizeof (in.s_addr));
|
|
puts(inet_ntoa(in));
|
|
}
|
|
else
|
|
{
|
|
char **p;
|
|
for (p = hpaddr->h_addr_list; *p != 0; p++)
|
|
{
|
|
struct in_addr in;
|
|
memcpy(&in.s_addr, *p, sizeof (in.s_addr));
|
|
printf ("IP address of %s is %s\n",ip,inet_ntoa(in));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
exit(error);
|
|
}
|