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 /isam | |
| 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 'isam')
| -rw-r--r-- | isam/isamchk.c | 2 | ||||
| -rw-r--r-- | isam/pack_isam.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/isam/isamchk.c b/isam/isamchk.c index daa9464eb4f..8603b436841 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -670,7 +670,7 @@ static void get_options(register int *argc, register char ***argv) if (isatty(fileno(stdout))) testflag|=T_WRITE_LOOP; - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL))) exit(ho_error); if (*argc == 0) diff --git a/isam/pack_isam.c b/isam/pack_isam.c index b2e21afc743..59594ccc929 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -353,7 +353,7 @@ static void get_options(int *argc, char ***argv) { int ho_error; - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL))) exit(ho_error); my_progname= argv[0][0]; |