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 /client | |
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 'client')
-rw-r--r-- | client/client_priv.h | 2 | ||||
-rw-r--r-- | client/mysql.cc | 3 | ||||
-rw-r--r-- | client/mysqladmin.c | 3 | ||||
-rw-r--r-- | client/mysqlbinlog.cc | 3 | ||||
-rw-r--r-- | client/mysqlcheck.c | 3 | ||||
-rw-r--r-- | client/mysqldump.c | 3 | ||||
-rw-r--r-- | client/mysqlimport.c | 3 | ||||
-rw-r--r-- | client/mysqlshow.c | 3 |
8 files changed, 8 insertions, 15 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index f321b47aec0..ae5556cac35 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -22,7 +22,7 @@ #include <mysql_embed.h> #include <mysql.h> #include <errmsg.h> -#include <getopt.h> +#include <my_getopt.h> /* We have to define 'enum options' identical in all files to keep OS2 happy */ diff --git a/client/mysql.cc b/client/mysql.cc index 1a0b4dffb05..41d7caf4b08 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -32,7 +32,6 @@ #include "client_priv.h" #include <m_ctype.h> #include <stdarg.h> -#include <my_getopt.h> #include <my_dir.h> #ifndef __GNU_LIBRARY__ #define __GNU_LIBRARY__ // Skip warnings in getopt.h @@ -41,7 +40,7 @@ #include <signal.h> #include <violite.h> -const char *VER= "12.5"; +const char *VER= "12.6"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 2359c7c54c5..6fa8e8220f4 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -19,12 +19,11 @@ #include "client_priv.h" #include <signal.h> -#include <my_getopt.h> #ifdef THREAD #include <my_pthread.h> /* because of signal() */ #endif -#define ADMIN_VERSION "8.32" +#define ADMIN_VERSION "8.34" #define MAX_MYSQL_VAR 64 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 04162faab8f..e420e3b6ad8 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -19,7 +19,6 @@ #include "client_priv.h" #include <time.h> #include "log_event.h" -#include <my_getopt.h> #define PROBE_HEADER_LEN (4+EVENT_LEN_OFFSET+4) @@ -125,7 +124,7 @@ static void die(const char* fmt, ...) static void print_version() { - printf("%s Ver 2.1 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); + printf("%s Ver 2.2 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); } diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 53778fbb57d..f0d7e998aa9 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -16,10 +16,9 @@ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */ -#define CHECK_VERSION "2.2" +#define CHECK_VERSION "2.3" #include "client_priv.h" -#include <my_getopt.h> #include <m_ctype.h> #include "mysql_version.h" #include "mysqld_error.h" diff --git a/client/mysqldump.c b/client/mysqldump.c index 47b87a03a8b..e2b9ab3f6b5 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -35,7 +35,7 @@ ** and adapted to mysqldump 05/11/01 by Jani Tolonen */ -#define DUMP_VERSION "9.04" +#define DUMP_VERSION "9.05" #include <my_global.h> #include <my_sys.h> @@ -46,7 +46,6 @@ #include "mysql.h" #include "mysql_version.h" #include "mysqld_error.h" -#include <my_getopt.h> /* Exit codes */ diff --git a/client/mysqlimport.c b/client/mysqlimport.c index af12b8dafc5..bc7860a052d 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -25,11 +25,10 @@ ** * * ** ************************* */ -#define IMPORT_VERSION "3.2" +#define IMPORT_VERSION "3.3" #include "client_priv.h" #include "mysql_version.h" -#include <my_getopt.h> static void db_error_with_table(MYSQL *mysql, char *table); static void db_error(MYSQL *mysql); diff --git a/client/mysqlshow.c b/client/mysqlshow.c index c89995ddb8d..74a41e69b1f 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -16,7 +16,7 @@ /* Show databases, tables or columns */ -#define SHOW_VERSION "9.2" +#define SHOW_VERSION "9.3" #include <my_global.h> #include "client_priv.h" @@ -27,7 +27,6 @@ #include "mysqld_error.h" #include <signal.h> #include <stdarg.h> -#include <my_getopt.h> #include "sslopt-vars.h" static my_string host=0,opt_password=0,user=0; |