diff options
| author | unknown <jani@hynda.(none)> | 2002-05-22 23:54:24 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.(none)> | 2002-05-22 23:54:24 +0300 |
| commit | 2276e8aeb845f5186f48925ae4e6c1e80ff529a8 (patch) | |
| tree | c01334461ba2741cbb5763ef8029cae9ea298d25 /fs | |
| parent | 4d6819171d7e8f2ed8a5bea7acc45669f5953b7e (diff) | |
| download | mariadb-git-2276e8aeb845f5186f48925ae4e6c1e80ff529a8.tar.gz | |
moved my_getopt.h under client_priv.h
Changed my_print_defaults, mysql_install, perror, resolve_stack_dump,
resolveip and pack_isam to use my_getopt.
client/client_priv.h:
getopt -> my_getopt
client/mysql.cc:
moved my_getopt.h under client_priv.h
client/mysqladmin.c:
moved my_getopt.h under client_priv.h
client/mysqlbinlog.cc:
moved my_getopt.h under client_priv.h
client/mysqlcheck.c:
moved my_getopt.h under client_priv.h
client/mysqldump.c:
moved my_getopt.h under client_priv.h
client/mysqlimport.c:
moved my_getopt.h under client_priv.h
client/mysqlshow.c:
moved my_getopt.h under client_priv.h
extra/my_print_defaults.c:
Changed from getopt to use my_getopt
extra/mysql_install.c:
Changed from getopt to use my_getopt
extra/perror.c:
Changed from getopt to use my_getopt
extra/resolve_stack_dump.c:
Changed from getopt to use my_getopt
extra/resolveip.c:
Changed from getopt to use my_getopt
fs/mysqlcorbafs.c:
Left reminder about my_getopt when this program is ready.
Currently it's not being compiled.
isam/pack_isam.c:
Changed from getopt to use my_getopt
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/mysqlcorbafs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/mysqlcorbafs.c b/fs/mysqlcorbafs.c index 8943c00ed25..4bc27618d4d 100644 --- a/fs/mysqlcorbafs.c +++ b/fs/mysqlcorbafs.c @@ -23,7 +23,7 @@ #include "libmysqlfs.h" #include "mysqlcorbafs.h" -#include <getopt.h> +#include <my_getopt.h> #define MAXPATHLEN 256 #include <sys/types.h> @@ -62,6 +62,10 @@ static char *default_charset, *current_host, *current_user, *opt_password, *path,*fields_terminated=0, *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0; + +/* This should be fixed to use my_getopt when the program is ready + + static struct option long_options[] = { {"add-locks", no_argument, 0,OPT_LOCKS}, @@ -99,6 +103,7 @@ static struct option long_options[] = {0, 0, 0, 0} }; +*/ /* void @@ -428,6 +433,8 @@ static int get_options(int *argc,char ***argv) my_bool tty_password=0; DBUG_ENTER("get_options"); load_defaults("my",load_default_groups,argc,argv); + + /* change this to use my_getopt when program is ready */ set_all_changeable_vars(changeable_vars); while ((c=getopt_long(*argc,*argv,"#::p::h:u:O:P:S:T:EBaAcCdefFlnqtvVw:?Ix", long_options, &option_index)) != EOF) |