summaryrefslogtreecommitdiff
path: root/extra/resolveip.c
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-08-28 06:08:17 +0300
committerunknown <monty@narttu.mysql.fi>2003-08-28 06:08:17 +0300
commit26bb50a19b8c3a79a745d052c14f73a5a06e466e (patch)
tree41b52ce07c94e5878b59ffb52bf26ad79aa89469 /extra/resolveip.c
parentad4fdb79cd4c6f06a1a09e0ded07cb7e8c76f07c (diff)
downloadmariadb-git-26bb50a19b8c3a79a745d052c14f73a5a06e466e.tar.gz
Add detection of in_addr_t
Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. (This will probably solve bug #563) Fix test for available file descriptors in mysqltest Fixed core dump bug in replication tests when running without transactional table support acconfig.h: Add detection of in_addr_t acinclude.m4: Add detection of in_addr_t configure.in: Add detection of in_addr_t extra/my_print_defaults.c: Cleanup extra/resolveip.c: Add detection of in_addr_t libmysql/dll.c: Fixed C++ commments myisam/mi_dynrec.c: Add ASSERT if allocated record length is to small myisam/mi_open.c: Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. myisam/mi_test_all.sh: Added valgrind option to make it easier to verify tests mysql-test/include/check_var_limit.inc: Fix test for available file descriptors mysql-test/r/myisam.result: More tests mysql-test/t/myisam.test: More tests mysql-test/t/query_cache_merge.test: Fix test for available file descriptors mysys/default.c: Cleanup mysys/my_pthread.c: Remove C++ comments sql/log.cc: Code cleanup Fixed core dump bug in replication tests when running without transactional table support.
Diffstat (limited to 'extra/resolveip.c')
-rw-r--r--extra/resolveip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c
index 9851ec49605..91f23bf5b00 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -36,6 +36,10 @@
extern int h_errno;
#endif
+#ifndef HAVE_IN_ADDR_T
+#define in_addr_t u_long
+#endif
+
static my_bool silent;
@@ -91,8 +95,6 @@ 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);