Author: paul
Date: 2006-01-23 22:26:06 +0100 (Mon, 23 Jan 2006)
New Revision: 1002
Log:
r2445@kite-hub: paul | 2006-01-23 13:36:56 -0600
Reformat.
Modified:
trunk/
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6574
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2444
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6574
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2445
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-23 21:25:50 UTC (rev 1001)
+++ trunk/refman-5.1/database-administration.xml 2006-01-23 21:26:06 UTC (rev 1002)
@@ -340,12 +340,12 @@
<listitem>
<para>
How to set the server SQL mode
-</para>
-</listitem>
+ </para>
+ </listitem>
-<listitem>
-<para>
-The server shutdown process
+ <listitem>
+ <para>
+ The server shutdown process
</para>
</listitem>
@@ -388,11 +388,10 @@
<command>mysql.server</command> reads options from the
<literal>[mysqld]</literal> and
<literal>[mysql.server]</literal> groups.
-</para>
+ </para>
-<para>
- An embedded MySQL
- server usually reads options from the
+ <para>
+ An embedded MySQL server usually reads options from the
<literal>[server]</literal>, <literal>[embedded]</literal>,
and
<literal>[<replaceable>xxxxx</replaceable>_SERVER]</literal>
@@ -401,10 +400,9 @@
</para>
<para>
- <command>mysqld</command> accepts many command options.
- For a brief list, execute <command>mysqld --help</command>. To
- see the full list, use <command>mysqld --verbose
- --help</command>.
+ <command>mysqld</command> accepts many command options. For a
+ brief list, execute <command>mysqld --help</command>. To see
+ the full list, use <command>mysqld --verbose --help</command>.
</para>
<para>
@@ -454,8 +452,8 @@
<para>
You can also set the values of server system variables by
- using variable names as options, as described later in
- this section.
+ using variable names as options, as described later in this
+ section.
</para>
<itemizedlist>
@@ -10033,7 +10031,8 @@
<para>
<command>mysql.server</command> can be found in the
<filename>support-files</filename> directory under your
- MySQL installation directory or in a MySQL source distribution.
+ MySQL installation directory or in a MySQL source
+ distribution.
</para>
<para>
@@ -10131,14 +10130,13 @@
several <command>mysqld</command> processes that listen for
connections on different Unix socket files and TCP/IP ports.
It can start or stop servers, or report their current
- status.
-The MySQL Instance Manager is an alternative means of managing multiple servers
-(see <xref linkend="instance-manager"/>).
+ status. The MySQL Instance Manager is an alternative means
+ of managing multiple servers (see
+ <xref linkend="instance-manager"/>).
</para>
<para>
-<command>mysqld_multi</command>
- searches for groups named
+ <command>mysqld_multi</command> searches for groups named
<literal>[mysqld<replaceable>N</replaceable>]</literal> in
<filename>my.cnf</filename> (or in the file named by the
<option>--config-file</option> option).
@@ -10152,8 +10150,8 @@
same that you would use in the <literal>[mysqld]</literal>
group used for starting <command>mysqld</command>. (See, for
example, <xref linkend="automatic-start"/>.) However, when
- using multiple servers, it is necessary that each one use its
- own value for options such as the Unix socket file and
+ using multiple servers, it is necessary that each one use
+ its own value for options such as the Unix socket file and
TCP/IP port number. For more information on which options
must be unique per server in a multiple-server environment,
see <xref linkend="multiple-servers"/>.
@@ -10170,8 +10168,8 @@
<para>
<literal>start</literal>, <literal>stop</literal>, and
- <literal>report</literal> indicate which operation
- to perform. You can perform the designated operation for a
+ <literal>report</literal> indicate which operation to
+ perform. You can perform the designated operation for a
single server or multiple servers, depending on the
<replaceable>GNR</replaceable> list that follows the option
name. If there is no list, <command>mysqld_multi</command>
@@ -10361,8 +10359,9 @@
</para>
<para>
- Print log information to <literal>stdout</literal> rather than to the log
- file. By default, output goes to the log file.
+ Print log information to <literal>stdout</literal>
+ rather than to the log file. By default, output goes to
+ the log file.
</para>
</listitem>
@@ -10495,12 +10494,13 @@
<listitem>
<para>
<emphasis role="bold">Important</emphasis>: Make sure
- that the data directory for each server is fully accessible to the Unix
- account that the specific <command>mysqld</command>
- process is started as. <emphasis>Do not</emphasis> use
- the Unix <replaceable>root</replaceable> account for this, unless you
- <emphasis>know</emphasis> what you are doing.
- See <xref linkend="changing-mysql-user"/>.
+ that the data directory for each server is fully
+ accessible to the Unix account that the specific
+ <command>mysqld</command> process is started as.
+ <emphasis>Do not</emphasis> use the Unix
+ <replaceable>root</replaceable> account for this, unless
+ you <emphasis>know</emphasis> what you are doing. See
+ <xref linkend="changing-mysql-user"/>.
</para>
</listitem>
@@ -10512,10 +10512,10 @@
username and password for each server. Also, make sure
that the account has the <literal>SHUTDOWN</literal>
privilege. If the servers that you want to manage have
- different usernames or passwords for the
- administrative accounts, you might want to create an
- account on each server that has the same username and
- password. For example, you might set up a common
+ different usernames or passwords for the administrative
+ accounts, you might want to create an account on each
+ server that has the same username and password. For
+ example, you might set up a common
<literal>multi_admin</literal> account by executing the
following commands for each server:
</para>
@@ -10531,8 +10531,8 @@
See <xref linkend="privileges"/>. You have to do this
for each <command>mysqld</command> server. Change the
connection parameters appropriately when connecting to
- each one. Note that the hostname part of the account name
- must allow you to connect as
+ each one. Note that the hostname part of the account
+ name must allow you to connect as
<literal>multi_admin</literal> from the host where you
want to run <command>mysqld_multi</command>.
</para>
@@ -10579,10 +10579,9 @@
</programlisting>
<para>
-The test performed by
- these lines should be successful, or you might encounter
- problems.
- See <xref linkend="mysqld-safe"/>.
+ The test performed by these lines should be successful,
+ or you might encounter problems. See
+ <xref linkend="mysqld-safe"/>.
</para>
</listitem>
@@ -10603,14 +10602,11 @@
<para>
The following example shows how you might set up an option
- file for use with <command>mysqld_multi</command>.
-The order in
- which the <command>mysqld</command> programs are started or
- stopped depends on the order in which they appear in the
- option file.
-Group numbers need not form an unbroken sequence.
-The first
- and fifth
+ file for use with <command>mysqld_multi</command>. The order
+ in which the <command>mysqld</command> programs are started
+ or stopped depends on the order in which they appear in the
+ option file. Group numbers need not form an unbroken
+ sequence. The first and fifth
<literal>[mysqld<replaceable>N</replaceable>]</literal>
groups were intentionally omitted from the example to
illustrate that you can have <quote>gaps</quote> in the
@@ -15722,8 +15718,8 @@
flush-privileges</command> to tell the
<command>mysqld</command> server to start using the new
grant tables. (Reloading the grant tables overrides the
- <option>--skip-grant-tables</option> option. This enables you
- to tell the server to begin using the grant tables again
+ <option>--skip-grant-tables</option> option. This enables
+ you to tell the server to begin using the grant tables again
without stopping and restarting it.)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1002 - in trunk: . refman-5.1 | paul | 23 Jan |
