1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remains of old getopt

Browse Source 
sql/sql_delete.cc:
  Removed unnecessary code
This commit is contained in:
unknown 2002-06-12 23:54:52 +03:00
parent 33e636cbb4
commit c554eeec98
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
myisam/ft_dump.c
View File

@ -20,7 +20,7 @@
#include "ftdefs.h" #include "ftdefs.h"
#include <my_getopt.h> #include <my_getopt.h>
static void get_options(int argc,char *argv[]); static void get_options(int *argc,char **argv[]);
static void usage(); static void usage();
static void complain(int val); static void complain(int val);
@ -66,7 +66,7 @@ int main(int argc,char *argv[])
struct { MI_INFO *info; } aio0, *aio=&aio0; /* for GWS_IN_USE */ struct { MI_INFO *info; } aio0, *aio=&aio0; /* for GWS_IN_USE */
MY_INIT(argv[0]); MY_INIT(argv[0]);
get_options(argc,argv); get_options(&argc, &argv);
if (count || dump) if (count || dump)
verbose=0; verbose=0;
if (!count && !dump && !lstats && !query) if (!count && !dump && !lstats && !query)
@ -75,17 +75,18 @@ int main(int argc,char *argv[])
if (verbose) if (verbose)
setbuf(stdout,NULL); setbuf(stdout,NULL);
if (argc-optind < 2) if (argc < 2)
usage(); usage();
if (!(info=mi_open(argv[optind],2,HA_OPEN_ABORT_IF_LOCKED))) if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED)))
goto err; goto err;
inx=atoi(argv[optind+1]); inx=atoi(argv[1]);
*buf2=0; *buf2=0;
aio->info=info; aio->info=info;
if ((inx >= info->s->base.keys) || !(info->s->keyinfo[inx].flag & HA_FULLTEXT)) if ((inx >= info->s->base.keys) ||
!(info->s->keyinfo[inx].flag & HA_FULLTEXT))
{ {
printf("Key %d in table %s is not a FULLTEXT key\n", inx, info->filename); printf("Key %d in table %s is not a FULLTEXT key\n", inx, info->filename);
goto err; goto err;
@ -240,11 +241,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
return 0; return 0;
} }
static void get_options(int argc, char *argv[])
static void get_options(int *argc, char **argv[])
{ {
int ho_error; 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)))
exit(ho_error); exit(ho_error);
} /* get options */ } /* get options */

2
sql/sql_delete.cc
View File

@ -274,8 +274,8 @@ multi_delete::initialize_tables(JOIN *join)
{ {
/* We are going to delete from this table */ /* We are going to delete from this table */
TABLE *tbl=walk->table=tab->table; TABLE *tbl=walk->table=tab->table;
/* Don't use KEYREAD optimization on this table */
tbl->no_keyread=1; tbl->no_keyread=1;
tbl->used_keys=0;
walk=walk->next; walk=walk->next;
if (!not_trans_safe && !tbl->file->has_transactions()) if (!not_trans_safe && !tbl->file->has_transactions())
not_trans_safe=true; not_trans_safe=true;