summaryrefslogtreecommitdiff
path: root/man/mysqladmin.1
diff options
context:
space:
mode:
Diffstat (limited to 'man/mysqladmin.1')
-rw-r--r--man/mysqladmin.136
1 files changed, 22 insertions, 14 deletions
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1
index 445beb30364..a34f7c28947 100644
--- a/man/mysqladmin.1
+++ b/man/mysqladmin.1
@@ -2,12 +2,12 @@
.\" Title: \fBmysqladmin\fR
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 11/04/2009
+.\" Date: 04/06/2010
.\" Manual: MySQL Database System
.\" Source: MySQL 5.1
.\" Language: English
.\"
-.TH "\FBMYSQLADMIN\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -46,7 +46,7 @@ shell> \fBmysqladmin [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIcommand\fR\fR\fB [\fR\
.\}
.PP
\fBmysqladmin\fR
-supports the commands described in the following list\&. Some of the commands take an argument following the command name\&.
+supports the following commands\&. Some of the commands take an argument following the command name\&.
.sp
.RS 4
.ie n \{\
@@ -211,7 +211,7 @@ old\-password \fInew\-password\fR
This is like the
password
command but stores the password using the old (pre\-4\&.1) password\-hashing format\&. (See
-Section\ \&5.5.6.3, \(lqPassword Hashing in MySQL\(rq\&.)
+Section\ \&5.3.2.3, \(lqPassword Hashing in MySQL\(rq\&.)
.RE
.sp
.RS 4
@@ -304,7 +304,7 @@ statement\&. If the
\fB\-\-verbose\fR
option is given, the output is like that of
SHOW FULL PROCESSLIST\&. (See
-Section\ \&12.5.5.31, \(lqSHOW PROCESSLIST Syntax\(rq\&.)
+Section\ \&12.4.5.31, \(lqSHOW PROCESSLIST Syntax\(rq\&.)
.RE
.sp
.RS 4
@@ -586,7 +586,13 @@ waits until the server\'s process ID file has been removed, to ensure that the s
.\" startup parameters: mysqladmin
.PP
\fBmysqladmin\fR
-supports the options in the following list\&. It also reads option files and supports the options for processing them described at
+supports the following options, which can be specified on the command line or in the
+[mysqladmin]
+and
+[client]
+option file groups\&.
+\fBmysqladmin\fR
+also supports the options for processing option files described at
Section\ \&4.2.3.3.1, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
.sp
.RS 4
@@ -618,7 +624,7 @@ Display a help message and exit\&.
\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
.sp
The directory where character sets are installed\&. See
-Section\ \&9.2, \(lqThe Character Set Used for Data and Sorting\(rq\&.
+Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&.
.RE
.sp
.RS 4
@@ -720,7 +726,7 @@ Print debugging information and memory and CPU usage statistics when the program
Use
\fIcharset_name\fR
as the default character set\&. See
-Section\ \&9.2, \(lqThe Character Set Used for Data and Sorting\(rq\&.
+Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&.
.RE
.sp
.RS 4
@@ -794,10 +800,12 @@ value following the
\fB\-\-password\fR
or
\fB\-p\fR
-option on the command line, you are prompted for one\&.
+option on the command line,
+\fBmysqladmin\fR
+prompts for one\&.
.sp
Specifying a password on the command line should be considered insecure\&. See
-Section\ \&5.5.6.2, \(lqEnd-User Guidelines for Password Security\(rq\&.
+Section\ \&5.3.2.2, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
.RE
.sp
.RS 4
@@ -813,7 +821,7 @@ Section\ \&5.5.6.2, \(lqEnd-User Guidelines for Password Security\(rq\&.
\fB\-\-pipe\fR,
\fB\-W\fR
.sp
-On Windows, connect to the server via a named pipe\&. This option applies only for connections to a local server, and only if the server supports named\-pipe connections\&.
+On Windows, connect to the server via a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
.RE
.sp
.RS 4
@@ -940,7 +948,7 @@ localhost, the Unix socket file to use, or, on Windows, the name of the named pi
Options that begin with
\fB\-\-ssl\fR
specify whether to connect to the server via SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&5.5.7.3, \(lqSSL Command Options\(rq\&.
+Section\ \&5.5.6.3, \(lqSSL Command Options\(rq\&.
.RE
.sp
.RS 4
@@ -1030,7 +1038,7 @@ You can also set the following variables by using
\fB\-\-\fR\fB\fIvar_name\fR\fR\fB=\fR\fB\fIvalue\fR\fR
The
\fB\-\-set\-variable\fR
-format is deprecated\&. syntax:
+format is deprecated and is removed in MySQL 5\&.5\&. syntax:
.sp
.RS 4
.ie n \{\
@@ -1064,7 +1072,7 @@ The maximum number of seconds to wait for server shutdown\&. The default value i
.SH "COPYRIGHT"
.br
.PP
-Copyright 2007-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
.PP
This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
.PP