diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2008-10-27 13:57:59 +0400 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2008-10-27 13:57:59 +0400 |
commit | be66e43dabe2681705a9adfe3d385496dc827882 (patch) | |
tree | aa7b899c121b6572fb65f716fb71cddc27f7136c /include/my_getopt.h | |
parent | b6704027d681a80be03d416e9c9c344d86a562dd (diff) | |
download | mariadb-git-be66e43dabe2681705a9adfe3d385496dc827882.tar.gz |
Bug#39289 libmysqld.a calls exit() upon error
Several functions (mostly in mysqld.cc) directly call
exit() function in case of errors, which is not a desired
behaviour expecially in the embedded-server library.
Fixed by making these functions return error sign instead
of exiting.
per-file comments:
include/my_getopt.h
Bug#39289 libmysqld.a calls exit() upon error
added 'error' retvalue for my_getopt_register_get_addr
libmysqld/lib_sql.cc
Bug#39289 libmysqld.a calls exit() upon error
unireg_clear() function implemented
mysys/default.c
Bug#39289 libmysqld.a calls exit() upon error
error returned instead of exit() call
mysys/mf_tempdir.c
Bug#39289 libmysqld.a calls exit() upon error
free_tmpdir() - fixed so it's not produce crash on uninitialized
tmpdir structure
mysys/my_getopt.c
Bug#39289 libmysqld.a calls exit() upon error
error returned instead of exit() call
sql/mysql_priv.h
Bug#39289 libmysqld.a calls exit() upon error
unireg_abort definition fixed for the embedded server
sql/mysqld.cc
Bug#39289 libmysqld.a calls exit() upon error
various functions fixed
error returned instead of exit() call
Diffstat (limited to 'include/my_getopt.h')
-rw-r--r-- | include/my_getopt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index 50ebe9190d8..7cbad607aac 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -72,7 +72,7 @@ extern void my_cleanup_options(const struct my_option *options); extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint, - const struct my_option *)); + const struct my_option *, int *)); ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, my_bool *fix); |