diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-04 16:14:09 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-04 16:14:09 +0200 |
| commit | 0d1ba873aa11ea581ebbda9f450027329f2e1a3b (patch) | |
| tree | 689c9d0271e23431f1ab0ac09e1af4d68a58ca76 /client | |
| parent | 9f90ff3f12f1fc2bcb70cde74dbd6f27e33e230c (diff) | |
| parent | 0176dacd54b7eb62ebc4a81909b189517aee2cb4 (diff) | |
| download | mariadb-git-0d1ba873aa11ea581ebbda9f450027329f2e1a3b.tar.gz | |
merge with 3.23.44
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_base.h:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/rpl000012.test:
Auto merged
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
Build-tools/Do-all-build-steps:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl000015-slave.sh:
Auto merged
mysql-test/t/rpl000016-slave.sh:
Auto merged
mysys/mf_cache.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_tempfile.c:
Auto merged
readline/vi_mode.c:
Auto merged
strings/strto.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/time.cc:
Auto merged
BUILD/SETUP.sh:
Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
Merge from 3.23.44
configure.in:
Update version number
extra/resolveip.c:
Portability fix
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 1 | ||||
| -rw-r--r-- | client/mysqladmin.c | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index b015e378127..79c03c3dc07 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -29,4 +29,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE, OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS, + OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE, OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES}; diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 7cddcfc8e04..8a260289ca9 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -23,7 +23,7 @@ #include <my_pthread.h> /* because of signal() */ #endif -#define ADMIN_VERSION "8.22" +#define ADMIN_VERSION "8.23" #define MAX_MYSQL_VAR 64 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -1130,7 +1130,7 @@ static void wait_pidfile(char *pidfile) system_filename(buff,pidfile); while ((fd = my_open(buff, O_RDONLY, MYF(0))) >= 0 && - count++ < opt_shutdown_timeout) + count++ < opt_shutdown_timeout && !interrupted) { my_close(fd,MYF(0)); sleep(1); diff --git a/client/mysqldump.c b/client/mysqldump.c index 64e7ae0fd82..aae6cdc14a1 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -33,13 +33,14 @@ ** T�nu Samuel <tonu@please.do.not.remove.this.spam.ee> **/ -#define DUMP_VERSION "8.17" +#define DUMP_VERSION "8.18" #include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> +#include "client_priv.h" #include "mysql.h" #include "mysql_version.h" #include "mysqld_error.h" @@ -95,12 +96,12 @@ static struct option long_options[] = {"add-drop-table", no_argument, 0, OPT_DROP}, {"add-locks", no_argument, 0, OPT_LOCKS}, {"allow-keywords", no_argument, 0, OPT_KEYWORDS}, - {"character-sets-dir",required_argument,0, MD_OPT_CHARSETS_DIR}, + {"character-sets-dir",required_argument,0, OPT_CHARSETS_DIR}, {"complete-insert", no_argument, 0, 'c'}, {"compress", no_argument, 0, 'C'}, {"databases", no_argument, 0, 'B'}, {"debug", optional_argument, 0, '#'}, - {"default-character-set", required_argument, 0, MD_OPT_DEFAULT_CHARSET}, + {"default-character-set", required_argument, 0, OPT_DEFAULT_CHARSET}, {"delayed-insert", no_argument, 0, OPT_DELAYED}, {"extended-insert", no_argument, 0, 'e'}, {"fields-terminated-by", required_argument, 0, (int) OPT_FTB}, @@ -318,10 +319,10 @@ static int get_options(int *argc,char ***argv) case 'A': opt_alldbs=1; break; - case MD_OPT_DEFAULT_CHARSET: + case OPT_DEFAULT_CHARSET: default_charset= optarg; break; - case MD_OPT_CHARSETS_DIR: + case OPT_CHARSETS_DIR: charsets_dir= optarg; break; case 'f': |