Author: paul
Date: 2006-01-22 05:13:28 +0100 (Sun, 22 Jan 2006)
New Revision: 980
Log:
r6544@frost: paul | 2006-01-21 22:12:57 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6543
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6544
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-22 04:13:11 UTC (rev 979)
+++ trunk/refman-4.1/database-administration.xml 2006-01-22 04:13:28 UTC (rev 980)
@@ -569,6 +569,21 @@
<listitem>
<para>
+ <option>--character-set-client-handshake</option>
+ </para>
+
+ <para>
+ Don't ignore character set information sent by the client.
+ To ignore client information and use the default server
+ character set, use
+ <option>--skip-character-set-client-handshake</option>;
+ this makes MySQL 4.1 and higher behave like MySQL 4.0.
+ This option was added in MySQL 4.1.15.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--chroot=<replaceable>path</replaceable></option>
</para>
@@ -7760,35 +7775,30 @@
<para>
A MySQL-Max server is a version of the <command>mysqld</command>
MySQL server that has been built to include additional features.
+ The MySQL-Max distribution to use depends on your platform:
</para>
- <para>
- The distribution to use depends on your platform:
- </para>
-
<itemizedlist>
<listitem>
<para>
For Windows, MySQL binary distributions include both the
standard server (<literal>mysqld.exe</literal>) and the
- MySQL-Max server (<command>mysqld-max.exe</command>), so you
- need not get a special distribution. Just use a regular
- Windows distribution, available at
- <ulink url="&base-url-downloads;"/>. See
- <xref linkend="windows-installation"/>.
+ MySQL-Max server (<command>mysqld-max.exe</command>), so no
+ special distribution is needed. Just use a regular Windows
+ distribution. See <xref linkend="windows-installation"/>.
</para>
</listitem>
<listitem>
<para>
- For Linux, if you install MySQL using RPM distributions, use
- the regular <literal>MySQL-server</literal> RPM first to
- install a standard server named <command>mysqld</command>.
- Then use the <literal>MySQL-Max</literal> RPM to install a
- server named <command>mysqld-max</command>. The
+ For Linux, if you install MySQL using RPM distributions, the
<literal>MySQL-Max</literal> RPM presupposes that you have
- installed the regular server RPM. See
+ already installed the regular server RPM. Use the regular
+ <literal>MySQL-server</literal> RPM first to install a
+ standard server named <command>mysqld</command>, and then use
+ the <literal>MySQL-Max</literal> RPM to install a server named
+ <command>mysqld-max</command>. See
<xref linkend="linux-rpm"/>, for more information on the Linux
RPM packages.
</para>
@@ -7850,7 +7860,9 @@
<para>
This option enables support for the Berkeley DB
- (<literal>BDB</literal>) storage engine.
+ (<literal>BDB</literal>) storage engine on those platforms for
+ which <literal>BDB</literal> is available. (See notes in the
+ following discussion.)
</para>
</listitem>
@@ -7883,9 +7895,10 @@
</para>
<para>
- This option enables support for the NDB Cluster storage engine
- in MySQL 4.1.2 and newer. <emphasis>Currently, MySQL Cluster
- is supported on Linux, Solaris, and Mac OS X only</emphasis>.
+ As of MySQL 4.1.2, this option enables support for the
+ <literal>NDB Cluster</literal> storage engine on those
+ platforms for which Cluster is available. (See notes in the
+ following discussion.)
</para>
</listitem>
@@ -7896,10 +7909,10 @@
<para>
This define is enabled to turn on database symbolic link
- support for Windows. (This applies only before MySQL 4.0. As
- of MySQL 4.0, symbolic link support is available for all
- Windows servers, so a Max server is not needed to take
- advantage of this feature.)
+ support for Windows. This applies only before MySQL 4.0. From
+ MySQL 4.0 onward, symbolic link support is enabled for all
+ Windows servers, so a MySQL-Max server is not needed to take
+ advantage of this feature.
</para>
</listitem>
@@ -7920,18 +7933,28 @@
</para>
<para>
- MySQL-Max servers versions 4.1.2 and above for Solaris, Mac OS X,
- and Linux (on most platforms) include support for the <literal>NDB
- Cluster</literal> storage engine. Note that the server must be
- started with the <option>ndbcluster</option> option in order to
- run the server as part of a MySQL Cluster. (For details, see
+ The following table shows on which platforms allow MySQL-Max
+ binaries include support for <literal>BDB</literal> and
+ <literal>NDB Cluster</literal>:
+ </para>
+
+ <para>
+ As of MySQL 4.1.2, MySQL Cluster is supported on Linux (on most
+ plataforms), Solaris, and Mac OS X only. Some users have reported
+ success in using MySQL Cluster built from source on BSD operating
+ systems, but these are not officially supported at this time. Note
+ that, even for servers compiled with Cluster support, the
+ <literal>NDB Cluster</literal> storage engine is not enabled by
+ default. You must start the server with the
+ <option>--ndbcluster</option> option to use it as part of a MySQL
+ Cluster. (For details, see
<xref linkend="mysql-cluster-configuration"/>.)
</para>
<para>
- The following table shows on which platforms allow MySQL-Max
- binaries include support for <literal>BDB</literal> and
- <literal>NDB Cluster</literal>:
+ The following table shows the platforms for which MySQL-Max
+ binaries include support for <literal>BDB</literal> and NDB
+ Cluster.
</para>
<informaltable>
@@ -8240,7 +8263,7 @@
<para>
By default, <command>mysqld_safe</command> tries to start an
executable named <command>mysqld-max</command> if it exists,
- or <command>mysqld</command> otherwise. Be aware of the
+ and <command>mysqld</command> otherwise. Be aware of the
implications of this behavior:
</para>
@@ -8253,19 +8276,20 @@
installs an executable named
<command>mysqld-max</command>, which causes
<command>mysqld_safe</command> to automatically use that
- executable from that point on.
+ executable rather than <command>mysqld</command> from
+ that point on.
</para>
</listitem>
<listitem>
<para>
If you install a MySQL-Max distribution that includes a
- server named <command>mysqld-max</command>, then upgrade
- later to a non-Max version of MySQL,
- <command>mysqld_safe</command> still attempts to run the
- old <command>mysqld-max</command> server. If you perform
- such an upgrade, you should manually remove the old
- <command>mysqld-max</command> server to ensure that
+ server named <command>mysqld-max</command>, and then
+ upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> will still attempt to run
+ the old <command>mysqld-max</command> server. If you
+ perform such an upgrade, you should manually remove the
+ old <command>mysqld-max</command> server to ensure that
<command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
@@ -8274,11 +8298,13 @@
</itemizedlist>
<para>
- To override the default behavior and specify explicitly
- which server you want to run, specify a
+ To override the default behavior and specify explicitly the
+ name of the server you want to run, specify a
<option>--mysqld</option> or
<option>--mysqld-version</option> option to
- <command>mysqld_safe</command>.
+ <command>mysqld_safe</command>. You can also use
+ <option>--ledir</option> to indicate the directory where
+ <command>mysqld_safe</command> should look for the server.
</para>
<para>
@@ -8352,25 +8378,11 @@
<listitem>
<para>
- <option>--character-set-client-handshake</option>
- </para>
-
- <para>
- Don't ignore character set information sent by the
- client. To ignore client information and use the default
- server character set, use
- <option>--skip-character-set-client-handshake</option>;
- this makes MySQL 4.1 and higher behave like MySQL 4.0.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--core-file-size=<replaceable>size</replaceable></option>
</para>
<para>
- The size of the core file <command>mysqld</command>
+ The size of the core file that <command>mysqld</command>
should be able to create. The option value is passed to
<command>ulimit -c</command>.
</para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-22 04:13:11 UTC (rev 979)
+++ trunk/refman-5.0/database-administration.xml 2006-01-22 04:13:28 UTC (rev 980)
@@ -593,6 +593,20 @@
<listitem>
<para>
+ <option>--character-set-client-handshake</option>
+ </para>
+
+ <para>
+ Don't ignore character set information sent by the client.
+ To ignore client information and use the default server
+ character set, use
+ <option>--skip-character-set-client-handshake</option>;
+ this makes MySQL behave like MySQL 4.0.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--chroot=<replaceable>path</replaceable></option>
</para>
@@ -8967,35 +8981,30 @@
<para>
A MySQL-Max server is a version of the <command>mysqld</command>
MySQL server that has been built to include additional features.
+ The MySQL-Max distribution to use depends on your platform:
</para>
- <para>
- The distribution to use depends on your platform:
- </para>
-
<itemizedlist>
<listitem>
<para>
For Windows, MySQL binary distributions include both the
standard server (<literal>mysqld.exe</literal>) and the
- MySQL-Max server (<command>mysqld-max.exe</command>), so you
- need not get a special distribution. Just use a regular
- Windows distribution, available at
- <ulink url="&base-url-downloads;"/>. See
- <xref linkend="windows-installation"/>.
+ MySQL-Max server (<command>mysqld-max.exe</command>), so no
+ special distribution is needed. Just use a regular Windows
+ distribution. See <xref linkend="windows-installation"/>.
</para>
</listitem>
<listitem>
<para>
- For Linux, if you install MySQL using RPM distributions, use
- the regular <literal>MySQL-server</literal> RPM first to
- install a standard server named <command>mysqld</command>.
- Then use the <literal>MySQL-Max</literal> RPM to install a
- server named <command>mysqld-max</command>. The
+ For Linux, if you install MySQL using RPM distributions, the
<literal>MySQL-Max</literal> RPM presupposes that you have
- installed the regular server RPM. See
+ already installed the regular server RPM. Use the regular
+ <literal>MySQL-server</literal> RPM first to install a
+ standard server named <command>mysqld</command>, and then use
+ the <literal>MySQL-Max</literal> RPM to install a server named
+ <command>mysqld-max</command>. See
<xref linkend="linux-rpm"/>, for more information on the Linux
RPM packages.
</para>
@@ -9059,8 +9068,10 @@
</para>
<para>
- This option enables support for the Berkeley DB (BDB) storage
- engine.
+ This option enables support for the Berkeley DB
+ (<literal>BDB</literal>) storage engine on those platforms for
+ which <literal>BDB</literal> is available. (See notes in the
+ following discussion.)
</para>
</listitem>
@@ -9114,12 +9125,9 @@
</para>
<para>
- This option enables support for the NDB Cluster storage
- engine. Currently (as of ¤t-version;), Cluster is
- supported on Linux, Solaris, and Mac OS X only. Some users
- have reported success in using MySQL Cluster built from source
- on BSD operating systems, but these are not officially
- supported at this time.
+ This option enables support for the <literal>NDB
+ Cluster</literal> storage engine on those platforms for which
+ Cluster is available. (See notes in the following discussion.)
</para>
</listitem>
@@ -9130,9 +9138,9 @@
<para>
This define is enabled to turn on database symbolic link
- support for Windows. Symbolic link support is available for
- all Windows servers, so a Max server is not needed to take
- advantage of this feature.
+ support for Windows. From MySQL 4.0 onward, symbolic link
+ support is enabled for all Windows servers, so a MySQL-Max
+ server is not needed to take advantage of this feature.
</para>
</listitem>
@@ -9153,17 +9161,22 @@
</para>
<para>
- MySQL-Max servers for Solaris, Mac OS X, and Linux (on most
- platforms) include support for the NDB Cluster storage engine.
- Note that the server must be started with the
- <literal>ndbcluster</literal> option in order to run the server as
- part of a MySQL Cluster. (For details, see
+ Currently, MySQL Cluster is supported on Linux (on most
+ plataforms), Solaris, and Mac OS X only. Some users have reported
+ success in using MySQL Cluster built from source on BSD operating
+ systems, but these are not officially supported at this time. Note
+ that, even for servers compiled with Cluster support, the
+ <literal>NDB Cluster</literal> storage engine is not enabled by
+ default. You must start the server with the
+ <option>--ndbcluster</option> option to use it as part of a MySQL
+ Cluster. (For details, see
<xref linkend="mysql-cluster-configuration"/>.)
</para>
<para>
- The following table shows on which platforms MySQL-Max binaries
- include support for <literal>BDB</literal> and NDB Cluster:
+ The following table shows the platforms for which MySQL-Max
+ binaries include support for <literal>BDB</literal> and NDB
+ Cluster.
</para>
<informaltable>
@@ -9425,13 +9438,13 @@
distributions still include <command>safe_mysqld</command>
as a symbolic link to <command>mysqld_safe</command>.
However, you should not rely on this as it almost certainly
- will be removed in future.
+ will be removed in the future.
</para>
<para>
By default, <command>mysqld_safe</command> tries to start an
executable named <command>mysqld-max</command> if it exists,
- or <command>mysqld</command> otherwise. Be aware of the
+ and <command>mysqld</command> otherwise. Be aware of the
implications of this behavior:
</para>
@@ -9444,19 +9457,20 @@
installs an executable named
<command>mysqld-max</command>, which causes
<command>mysqld_safe</command> to automatically use that
- executable from that point on.
+ executable rather than <command>mysqld</command> from
+ that point on.
</para>
</listitem>
<listitem>
<para>
If you install a MySQL-Max distribution that includes a
- server named <command>mysqld-max</command>, then upgrade
- later to a non-Max version of MySQL,
- <command>mysqld_safe</command> still attempts to run the
- old <command>mysqld-max</command> server. If you perform
- such an upgrade, you should manually remove the old
- <command>mysqld-max</command> server to ensure that
+ server named <command>mysqld-max</command>, and then
+ upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> will still attempt to run
+ the old <command>mysqld-max</command> server. If you
+ perform such an upgrade, you should manually remove the
+ old <command>mysqld-max</command> server to ensure that
<command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
@@ -9465,11 +9479,13 @@
</itemizedlist>
<para>
- To override the default behavior and specify explicitly
- which server you want to run, specify a
+ To override the default behavior and specify explicitly the
+ name of the server you want to run, specify a
<option>--mysqld</option> or
<option>--mysqld-version</option> option to
- <command>mysqld_safe</command>.
+ <command>mysqld_safe</command>. You can also use
+ <option>--ledir</option> to indicate the directory where
+ <command>mysqld_safe</command> should look for the server.
</para>
<para>
@@ -9553,25 +9569,11 @@
<listitem>
<para>
- <option>--character-set-client-handshake</option>
- </para>
-
- <para>
- Don't ignore character set information sent by the
- client. To ignore client information and use the default
- server character set, use
- <option>--skip-character-set-client-handshake</option>;
- this makes MySQL behave like MySQL 4.0.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--core-file-size=<replaceable>size</replaceable></option>
</para>
<para>
- The size of the core file <command>mysqld</command>
+ The size of the core file that <command>mysqld</command>
should be able to create. The option value is passed to
<command>ulimit -c</command>.
</para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-22 04:13:11 UTC (rev 979)
+++ trunk/refman-5.1/database-administration.xml 2006-01-22 04:13:28 UTC (rev 980)
@@ -617,6 +617,20 @@
<listitem>
<para>
+ <option>--character-set-client-handshake</option>
+ </para>
+
+ <para>
+ Don't ignore character set information sent by the client.
+ To ignore client information and use the default server
+ character set, use
+ <option>--skip-character-set-client-handshake</option>;
+ this makes MySQL behave like MySQL 4.0.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--chroot=<replaceable>path</replaceable></option>
</para>
@@ -9012,35 +9026,30 @@
<para>
A MySQL-Max server is a version of the <command>mysqld</command>
MySQL server that has been built to include additional features.
+ The MySQL-Max distribution to use depends on your platform:
</para>
- <para>
- The distribution to use depends on your platform:
- </para>
-
<itemizedlist>
<listitem>
<para>
For Windows, MySQL binary distributions include both the
standard server (<literal>mysqld.exe</literal>) and the
- MySQL-Max server (<command>mysqld-max.exe</command>), so you
- need not get a special distribution. Just use a regular
- Windows distribution, available at
- <ulink url="&base-url-downloads;"/>. See
- <xref linkend="windows-installation"/>.
+ MySQL-Max server (<command>mysqld-max.exe</command>), so no
+ special distribution is needed. Just use a regular Windows
+ distribution. See <xref linkend="windows-installation"/>.
</para>
</listitem>
<listitem>
<para>
- For Linux, if you install MySQL using RPM distributions, use
- the regular <literal>MySQL-server</literal> RPM first to
- install a standard server named <command>mysqld</command>.
- Then use the <literal>MySQL-Max</literal> RPM to install a
- server named <command>mysqld-max</command>. The
+ For Linux, if you install MySQL using RPM distributions, the
<literal>MySQL-Max</literal> RPM presupposes that you have
- installed the regular server RPM. See
+ already installed the regular server RPM. Use the regular
+ <literal>MySQL-server</literal> RPM first to install a
+ standard server named <command>mysqld</command>, and then use
+ the <literal>MySQL-Max</literal> RPM to install a server named
+ <command>mysqld-max</command>. See
<xref linkend="linux-rpm"/>, for more information on the Linux
RPM packages.
</para>
@@ -9104,8 +9113,10 @@
</para>
<para>
- This option enables support for the Berkeley DB (BDB) storage
- engine.
+ This option enables support for the Berkeley DB
+ (<literal>BDB</literal>) storage engine on those platforms for
+ which <literal>BDB</literal> is available. (See notes in the
+ following discussion.)
</para>
</listitem>
@@ -9159,12 +9170,9 @@
</para>
<para>
- This option enables support for the NDB Cluster storage
- engine. Currently (as of ¤t-version;), Cluster is
- supported on Linux, Solaris, and Mac OS X only. Some users
- have reported success in using MySQL Cluster built from source
- on BSD operating systems, but these are not officially
- supported at this time.
+ This option enables support for the <literal>NDB
+ Cluster</literal> storage engine on those platforms for which
+ Cluster is available. (See notes in the following discussion.)
</para>
</listitem>
@@ -9175,9 +9183,9 @@
<para>
This define is enabled to turn on database symbolic link
- support for Windows. Symbolic link support is available for
- all Windows servers, so a Max server is not needed to take
- advantage of this feature.
+ support for Windows. From MySQL 4.0 onward, symbolic link
+ support is enabled for all Windows servers, so a MySQL-Max
+ server is not needed to take advantage of this feature.
</para>
</listitem>
@@ -9198,17 +9206,22 @@
</para>
<para>
- MySQL-Max servers for Solaris, Mac OS X, and Linux (on most
- platforms) include support for the NDB Cluster storage engine.
- Note that the server must be started with the
- <literal>ndbcluster</literal> option in order to run the server as
- part of a MySQL Cluster. (For details, see
+ Currently, MySQL Cluster is supported on Linux (on most
+ plataforms), Solaris, and Mac OS X only. Some users have reported
+ success in using MySQL Cluster built from source on BSD operating
+ systems, but these are not officially supported at this time. Note
+ that, even for servers compiled with Cluster support, the
+ <literal>NDB Cluster</literal> storage engine is not enabled by
+ default. You must start the server with the
+ <option>--ndbcluster</option> option to use it as part of a MySQL
+ Cluster. (For details, see
<xref linkend="mysql-cluster-configuration"/>.)
</para>
<para>
- The following table shows on which platforms MySQL-Max binaries
- include support for <literal>BDB</literal> and NDB Cluster:
+ The following table shows the platforms for which MySQL-Max
+ binaries include support for <literal>BDB</literal> and NDB
+ Cluster.
</para>
<informaltable>
@@ -9478,13 +9491,13 @@
distributions still include <command>safe_mysqld</command>
as a symbolic link to <command>mysqld_safe</command>.
However, you should not rely on this as it almost certainly
- will be removed in future.
+ will be removed in the future.
</para>
<para>
By default, <command>mysqld_safe</command> tries to start an
executable named <command>mysqld-max</command> if it exists,
- or <command>mysqld</command> otherwise. Be aware of the
+ and <command>mysqld</command> otherwise. Be aware of the
implications of this behavior:
</para>
@@ -9497,19 +9510,20 @@
installs an executable named
<command>mysqld-max</command>, which causes
<command>mysqld_safe</command> to automatically use that
- executable from that point on.
+ executable rather than <command>mysqld</command> from
+ that point on.
</para>
</listitem>
<listitem>
<para>
If you install a MySQL-Max distribution that includes a
- server named <command>mysqld-max</command>, then upgrade
- later to a non-Max version of MySQL,
- <command>mysqld_safe</command> still attempts to run the
- old <command>mysqld-max</command> server. If you perform
- such an upgrade, you should manually remove the old
- <command>mysqld-max</command> server to ensure that
+ server named <command>mysqld-max</command>, and then
+ upgrade later to a non-Max version of MySQL,
+ <command>mysqld_safe</command> will still attempt to run
+ the old <command>mysqld-max</command> server. If you
+ perform such an upgrade, you should manually remove the
+ old <command>mysqld-max</command> server to ensure that
<command>mysqld_safe</command> runs the new
<command>mysqld</command> server.
</para>
@@ -9518,11 +9532,13 @@
</itemizedlist>
<para>
- To override the default behavior and specify explicitly
- which server you want to run, specify a
+ To override the default behavior and specify explicitly the
+ name of the server you want to run, specify a
<option>--mysqld</option> or
<option>--mysqld-version</option> option to
- <command>mysqld_safe</command>.
+ <command>mysqld_safe</command>. You can also use
+ <option>--ledir</option> to indicate the directory where
+ <command>mysqld_safe</command> should look for the server.
</para>
<para>
@@ -9606,25 +9622,11 @@
<listitem>
<para>
- <option>--character-set-client-handshake</option>
- </para>
-
- <para>
- Don't ignore character set information sent by the
- client. To ignore client information and use the default
- server character set, use
- <option>--skip-character-set-client-handshake</option>;
- this makes MySQL behave like MySQL 4.0.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--core-file-size=<replaceable>size</replaceable></option>
</para>
<para>
- The size of the core file <command>mysqld</command>
+ The size of the core file that <command>mysqld</command>
should be able to create. The option value is passed to
<command>ulimit -c</command>.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r980 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 22 Jan |
