diff options
author | unknown <rburnett@build.mysql.com> | 2004-08-26 13:43:27 +0200 |
---|---|---|
committer | unknown <rburnett@build.mysql.com> | 2004-08-26 13:43:27 +0200 |
commit | ad1f3bb17d5a8117ff9feb987c04a52f22394189 (patch) | |
tree | ea0d4239af8a461b94df47956bde1945207ca88e /extra/mysql_waitpid.c | |
parent | 337f02b74e3eab69fc5f6349351e43b0c04b2166 (diff) | |
parent | 3b55c6f394280835b193f2cb272faabeccbb06dd (diff) | |
download | mariadb-git-ad1f3bb17d5a8117ff9feb987c04a52f22394189.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
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) |