diff options
author | rburnett@build.mysql.com <> | 2004-08-14 03:38:37 +0200 |
---|---|---|
committer | rburnett@build.mysql.com <> | 2004-08-14 03:38:37 +0200 |
commit | 67003d1c98988de4cd8fa0ac81bce26bcf45a173 (patch) | |
tree | 8bab2307b9948e0dc6a489230cd690abe672411d /extra/mysql_waitpid.c | |
parent | f78ec279e9d7dfd27833d896ee46bf4cf7dda58b (diff) | |
download | mariadb-git-67003d1c98988de4cd8fa0ac81bce26bcf45a173.tar.gz |
mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
Added NULL error reporting parameter to handle_options
log.cc:
Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did.
mysqld.cc:
Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
Added NULL as error reporter arg to the end of handle_options
Many files:
Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback
mysqld.dsp:
Added custom build step for compiling message file and added message resource file (output of mc)
Diffstat (limited to 'extra/mysql_waitpid.c')
-rw-r--r-- | extra/mysql_waitpid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c index bff1752ec21..9fcabfbb53e 100644 --- a/extra/mysql_waitpid.c +++ b/extra/mysql_waitpid.c @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) progname= argv[0]; - if (handle_options(&argc, &argv, my_long_options, get_one_option)) + if (handle_options(&argc, &argv, my_long_options, get_one_option, NULL)) exit(-1); if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 || (t= atoi(argv[1])) <= 0) |