diff options
author | unknown <monty@narttu.mysql.fi> | 2003-08-28 06:08:17 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-08-28 06:08:17 +0300 |
commit | 35c2595d03b99403ba6f2994e540ca63e2985574 (patch) | |
tree | 41b52ce07c94e5878b59ffb52bf26ad79aa89469 /extra | |
parent | 15a55e611e1fc2118bb8ac48043f229e6d89eaed (diff) | |
download | mariadb-git-35c2595d03b99403ba6f2994e540ca63e2985574.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')
-rw-r--r-- | extra/my_print_defaults.c | 14 | ||||
-rw-r--r-- | extra/resolveip.c | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 549b2124b55..41c26e73dff 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -136,18 +136,18 @@ int main(int argc, char **argv) arguments[0]=my_progname; arguments[1]=0; if ((error= load_defaults(config_file, (const char **) load_default_groups, - &count, &arguments)) > 1) + &count, &arguments))) { if (verbose && opt_defaults_file_used) { - if (error == 2) - fprintf(stderr, "WARNING: Defaults file (%s) not found!\n", + if (error == 1) + fprintf(stderr, "WARNING: Defaults file '%s' not found!\n", config_file); - if (error == 3) - fprintf(stderr, "WARNING: Defaults file (%s) is not a regular file!\n", + if (error == 2) + fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n", config_file); } - exit(2); // Non-fatal error + error= 2; } for (argument= arguments+1 ; *argument ; argument++) @@ -155,5 +155,5 @@ int main(int argc, char **argv) my_free((char*) load_default_groups,MYF(0)); free_defaults(arguments); - exit(0); + exit(error); } 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); |