diff options
| author | unknown <serg@serg.mylan> | 2004-08-26 17:49:16 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-26 17:49:16 +0200 |
| commit | 90301a065c8a47fde5157e0f4c61a79a6f8faefc (patch) | |
| tree | 29938b2da4686100100ecd2c13659b0c64b7191b /myisam | |
| parent | 717fc0b01eae7a0c0f647ff16cd5b7244fcc21e8 (diff) | |
| parent | 5c30236ab3afa6e5027ea0aaf00fee9e7abdf481 (diff) | |
| download | mariadb-git-90301a065c8a47fde5157e0f4c61a79a6f8faefc.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
client/mysql.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_test1.c | 2 | ||||
| -rw-r--r-- | myisam/myisam_ftdump.c | 2 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 2 | ||||
| -rw-r--r-- | myisam/myisampack.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c index 77c4d3dfbad..5574eaba101 100644 --- a/myisam/mi_test1.c +++ b/myisam/mi_test1.c @@ -644,7 +644,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); return; diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c index eeee96d0ff2..cbc8437da79 100644 --- a/myisam/myisam_ftdump.c +++ b/myisam/myisam_ftdump.c @@ -68,7 +68,7 @@ int main(int argc,char *argv[]) struct { MI_INFO *info; } aio0, *aio=&aio0; /* for GWS_IN_USE */ MY_INIT(argv[0]); - if ((error=handle_options(&argc, &argv, my_long_options, get_one_option))) + if ((error=handle_options(&argc, &argv, my_long_options, get_one_option, 0))) exit(error); if (count || dump) verbose=0; diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 2c44953ccc9..5a6717833c5 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -696,7 +696,7 @@ static void get_options(register int *argc,register char ***argv) if (isatty(fileno(stdout))) check_param.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 using repair, then update checksum if one uses --update-state */ diff --git a/myisam/myisampack.c b/myisam/myisampack.c index de4bd80805a..d3241467d23 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -350,7 +350,7 @@ static void get_options(int *argc,char ***argv) if (isatty(fileno(stdout))) write_loop=1; - 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) |