Author: paul
Date: 2006-01-10 02:11:11 +0100 (Tue, 10 Jan 2006)
New Revision: 747
Log:
r6010@frost: paul | 2006-01-09 19:09:23 -0600
List short option form last, not first.
Put options in order.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/ndbcluster.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/ndbcluster.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6007
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6010
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1994
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-4.1/database-administration.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -18967,21 +18967,20 @@
<listitem>
<para>
- <option>-S</option>, <option>--sort-index</option>
+ <option>--analyze</option>, <option>-a</option>
</para>
</listitem>
<listitem>
<para>
- <option>-R
- <replaceable>index_num</replaceable></option>,
- <option>--sort-records=<replaceable>index_num</replaceable></option>
+ <option>--sort-index</option>, <option>-S</option>
</para>
</listitem>
<listitem>
<para>
- <option>-a</option>, <option>--analyze</option>
+ <option>--sort-records=<replaceable>index_num</replaceable></option>,
+ <option>-R <replaceable>index_num</replaceable></option>
</para>
</listitem>
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-4.1/ndbcluster.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -1266,10 +1266,11 @@
<xref linkend="mysql-cluster-limitations-in-4-1"/>.) This
means that, once the <literal>world</literal> database and
its tables have been created on one data node, you need to
- issue the statement <literal>CREATE DATABASE world;</literal>
- followed by <literal>FLUSH TABLES;</literal> on each SQL
- node in the cluster. This will cause the node to recognize
- the database and read its table definitions.
+ issue the statement <literal>CREATE DATABASE
+ world;</literal> followed by <literal>FLUSH
+ TABLES;</literal> on each SQL node in the cluster. This will
+ cause the node to recognize the database and read its table
+ definitions.
</para>
<para>
@@ -5729,8 +5730,8 @@
<listitem>
<para>
- <option>-?</option>, <option>--usage</option>,
- <option>--help</option>
+ <option>--help</option> <option>--usage</option>,
+ <option>-?</option>
</para>
<para>
@@ -5741,27 +5742,9 @@
<listitem>
<para>
- <option>-V</option>, <option>--version</option>
- </para>
-
- <para>
- Prints the version number of the <command>ndbd</command>
- process. The version number is the MySQL Cluster version
- number. The version number is relevant because not all
- versions can be used together, and at startup the MySQL
- Cluster processes verifies that the versions of the binaries
- being used can co-exist in the same cluster. This is also
- important when performing an online software upgrade of
- MySQL Cluster (see <literal>Software Upgrade of MySQL
- Cluster</literal>).
- </para>
- </listitem>
-
- <listitem>
- <para>
+ <option>--connect-string=<replaceable>connect_string</replaceable></option>,
<option>-c
- <replaceable>connect_string</replaceable></option>,
- <option>--connect-string</option>
+ <replaceable>connect_string</replaceable></option>
</para>
<para>
@@ -5794,7 +5777,8 @@
<listitem>
<para>
- <option>-e</option>, <option>--execute</option>
+ <option>--execute=<literal>command</literal></option>
+ <option>-e <literal>command</literal></option>
</para>
<para>
@@ -5829,6 +5813,24 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Prints the version number of the <command>ndbd</command>
+ process. The version number is the MySQL Cluster version
+ number. The version number is relevant because not all
+ versions can be used together, and at startup the MySQL
+ Cluster processes verifies that the versions of the binaries
+ being used can co-exist in the same cluster. This is also
+ important when performing an online software upgrade of
+ MySQL Cluster (see <literal>Software Upgrade of MySQL
+ Cluster</literal>).
+ </para>
+ </listitem>
+
</itemizedlist>
<section id="new-mysqld-command-options">
@@ -5839,6 +5841,19 @@
<listitem>
<para>
+ <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
+ </para>
+
+ <para>
+ When using the <literal>NDB</literal> storage engine, it
+ is possible through setting this option to specify the
+ management server that distributes cluster configuration
+ data.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--ndbcluster</option>
</para>
@@ -5869,19 +5884,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
- </para>
-
- <para>
- When using the <literal>NDB</literal> storage engine, it
- is possible through setting this option to specify the
- management server that distributes cluster configuration
- data.
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -5899,31 +5901,19 @@
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
Instructs <command>ndbd</command> to execute as a daemon
process. From MySQL 4.1.5 on, this is the default
- behavior.
+ behavior. <option>--nodaemon</option> can be used to not
+ start the process as a daemon.
</para>
</listitem>
<listitem>
<para>
- <option>--nodaemon</option>
- </para>
-
- <para>
- Instructs <command>ndbd</command> not to start as a daemon
- process. Useful when <command>ndbd</command> is being
- debugged and you want output to be redirected to the
- screen.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--initial</option>
</para>
@@ -5991,6 +5981,19 @@
<listitem>
<para>
+ <option>--nodaemon</option>
+ </para>
+
+ <para>
+ Instructs <command>ndbd</command> not to start as a daemon
+ process. Useful when <command>ndbd</command> is being
+ debugged and you want output to be redirected to the
+ screen.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--nostart</option>
</para>
@@ -6023,9 +6026,9 @@
<listitem>
<para>
- <option>-f <replaceable>filename</replaceable></option>,
<option>--config-file=<replaceable>filename</replaceable></option>,
- <option>-c <replaceable>filename</replaceable></option>
+ <option>-c <replaceable>filename</replaceable></option>,
+ <option>-f <replaceable>filename</replaceable></option>
</para>
<para>
@@ -6039,7 +6042,7 @@
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-5.0/database-administration.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -21124,21 +21124,20 @@
<listitem>
<para>
- <option>-S</option>, <option>--sort-index</option>
+ <option>--analyze</option>, <option>-a</option>
</para>
</listitem>
<listitem>
<para>
- <option>-R
- <replaceable>index_num</replaceable></option>,
- <option>--sort-records=<replaceable>index_num</replaceable></option>
+ <option>--sort-index</option>, <option>-S</option>
</para>
</listitem>
<listitem>
<para>
- <option>-a</option>, <option>--analyze</option>
+ <option>--sort-records=<replaceable>index_num</replaceable></option>,
+ <option>-R <replaceable>index_num</replaceable></option>
</para>
</listitem>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-5.0/ndbcluster.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -5713,8 +5713,8 @@
<listitem>
<para>
- <option>-?</option>, <option>--usage</option>,
- <option>--help</option>
+ <option>--help</option> <option>--usage</option>,
+ <option>-?</option>
</para>
<para>
@@ -5725,27 +5725,9 @@
<listitem>
<para>
- <option>-V</option>, <option>--version</option>
- </para>
-
- <para>
- Prints the version number of the <command>ndbd</command>
- process. The version number is the MySQL Cluster version
- number. The version number is relevant because not all
- versions can be used together, and at startup the MySQL
- Cluster processes verifies that the versions of the binaries
- being used can co-exist in the same cluster. This is also
- important when performing an online software upgrade of
- MySQL Cluster (see <literal>Software Upgrade of MySQL
- Cluster</literal>).
- </para>
- </listitem>
-
- <listitem>
- <para>
+ <option>--connect-string=<replaceable>connect_string</replaceable></option>,
<option>-c
- <replaceable>connect_string</replaceable></option>,
- <option>--connect-string</option>
+ <replaceable>connect_string</replaceable></option>
</para>
<para>
@@ -5773,7 +5755,8 @@
<listitem>
<para>
- <option>-e</option>, <option>--execute</option>
+ <option>--execute=<literal>command</literal></option>
+ <option>-e <literal>command</literal></option>
</para>
<para>
@@ -5808,6 +5791,24 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Prints the version number of the <command>ndbd</command>
+ process. The version number is the MySQL Cluster version
+ number. The version number is relevant because not all
+ versions can be used together, and at startup the MySQL
+ Cluster processes verifies that the versions of the binaries
+ being used can co-exist in the same cluster. This is also
+ important when performing an online software upgrade of
+ MySQL Cluster (see <literal>Software Upgrade of MySQL
+ Cluster</literal>).
+ </para>
+ </listitem>
+
</itemizedlist>
<section id="new-mysqld-command-options">
@@ -5818,6 +5819,19 @@
<listitem>
<para>
+ <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
+ </para>
+
+ <para>
+ When using the <literal>NDB</literal> storage engine, it
+ is possible through setting this option to specify the
+ management server that distributes cluster configuration
+ data.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--ndbcluster</option>
</para>
@@ -5848,19 +5862,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
- </para>
-
- <para>
- When using the <literal>NDB</literal> storage engine, it
- is possible through setting this option to specify the
- management server that distributes cluster configuration
- data.
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -5878,30 +5879,19 @@
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
Instructs <command>ndbd</command> to execute as a daemon
process (the default behavior).
+ <option>--nodaemon</option> can be used to not start the
+ process as a daemon.
</para>
</listitem>
<listitem>
<para>
- <option>--nodaemon</option>
- </para>
-
- <para>
- Instructs <command>ndbd</command> not to start as a daemon
- process. Useful when <command>ndbd</command> is being
- debugged and you want output to be redirected to the
- screen.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--initial</option>
</para>
@@ -5963,6 +5953,19 @@
<listitem>
<para>
+ <option>--nodaemon</option>
+ </para>
+
+ <para>
+ Instructs <command>ndbd</command> not to start as a daemon
+ process. Useful when <command>ndbd</command> is being
+ debugged and you want output to be redirected to the
+ screen.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--nostart</option>
</para>
@@ -5995,10 +5998,8 @@
<listitem>
<para>
- <option>-f <replaceable>filename</replaceable>,
- --config-file=<replaceable>filename</replaceable></option>,
- (<emphasis role="bold">OBSOLETE</emphasis>): <option>-c
- <replaceable>filename</replaceable></option>
+ <option>--config-file=<replaceable>file_name</replaceable></option>,
+ <option>-f <replaceable>file_name</replaceable></option>,
</para>
<para>
@@ -6006,15 +6007,20 @@
use for its configuration file. This option must be
specified. The file name defaults to
<literal>config.ini</literal>.
- <emphasis role="bold">Note</emphasis>: The
- <option>-c</option> shortcut is obsolete and should
- <emphasis>not</emphasis> be used in new installations.
</para>
+
+ <para>
+ <emphasis role="bold">Note</emphasis>: This option also
+ can be given as <option>-c
+ <filename>file_name</filename></option>, but this shortcut
+ is obsolete and should <emphasis>not</emphasis> be used in
+ new installations.
+ </para>
</listitem>
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-5.1/database-administration.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -21069,21 +21069,20 @@
<listitem>
<para>
- <option>-S</option>, <option>--sort-index</option>
+ <option>--analyze</option>, <option>-a</option>
</para>
</listitem>
<listitem>
<para>
- <option>-R
- <replaceable>index_num</replaceable></option>,
- <option>--sort-records=<replaceable>index_num</replaceable></option>
+ <option>--sort-index</option>, <option>-S</option>
</para>
</listitem>
<listitem>
<para>
- <option>-a</option>, <option>--analyze</option>
+ <option>--sort-records=<replaceable>index_num</replaceable></option>,
+ <option>-R <replaceable>index_num</replaceable></option>
</para>
</listitem>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-01-09 20:43:55 UTC (rev 746)
+++ trunk/refman-5.1/ndbcluster.xml 2006-01-10 01:11:11 UTC (rev 747)
@@ -5711,8 +5711,8 @@
<listitem>
<para>
- <option>-?</option>, <option>--usage</option>,
- <option>--help</option>
+ <option>--help</option> <option>--usage</option>,
+ <option>-?</option>
</para>
<para>
@@ -5723,27 +5723,9 @@
<listitem>
<para>
- <option>-V</option>, <option>--version</option>
- </para>
-
- <para>
- Prints the version number of the <command>ndbd</command>
- process. The version number is the MySQL Cluster version
- number. The version number is relevant because not all
- versions can be used together, and at startup the MySQL
- Cluster processes verifies that the versions of the binaries
- being used can co-exist in the same cluster. This is also
- important when performing an online software upgrade of
- MySQL Cluster (see <literal>Software Upgrade of MySQL
- Cluster</literal>).
- </para>
- </listitem>
-
- <listitem>
- <para>
+ <option>--connect-string=<replaceable>connect_string</replaceable></option>,
<option>-c
- <replaceable>connect_string</replaceable></option>,
- <option>--connect-string</option>
+ <replaceable>connect_string</replaceable></option>
</para>
<para>
@@ -5771,7 +5753,8 @@
<listitem>
<para>
- <option>-e</option>, <option>--execute</option>
+ <option>--execute=<literal>command</literal></option>
+ <option>-e <literal>command</literal></option>
</para>
<para>
@@ -5806,6 +5789,24 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Prints the version number of the <command>ndbd</command>
+ process. The version number is the MySQL Cluster version
+ number. The version number is relevant because not all
+ versions can be used together, and at startup the MySQL
+ Cluster processes verifies that the versions of the binaries
+ being used can co-exist in the same cluster. This is also
+ important when performing an online software upgrade of
+ MySQL Cluster (see <literal>Software Upgrade of MySQL
+ Cluster</literal>).
+ </para>
+ </listitem>
+
</itemizedlist>
<section id="new-mysqld-command-options">
@@ -5816,6 +5817,19 @@
<listitem>
<para>
+ <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
+ </para>
+
+ <para>
+ When using the <literal>NDB</literal> storage engine, it
+ is possible through setting this option to specify the
+ management server that distributes cluster configuration
+ data.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--ndbcluster</option>
</para>
@@ -5846,19 +5860,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
- </para>
-
- <para>
- When using the <literal>NDB</literal> storage engine, it
- is possible through setting this option to specify the
- management server that distributes cluster configuration
- data.
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -5876,30 +5877,19 @@
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
Instructs <command>ndbd</command> to execute as a daemon
process (the default behavior).
+ <option>--nodaemon</option> can be used to not start the
+ process as a daemon.
</para>
</listitem>
<listitem>
<para>
- <option>--nodaemon</option>
- </para>
-
- <para>
- Instructs <command>ndbd</command> not to start as a daemon
- process. Useful when <command>ndbd</command> is being
- debugged and you want output to be redirected to the
- screen.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--initial</option>
</para>
@@ -5961,6 +5951,19 @@
<listitem>
<para>
+ <option>--nodaemon</option>
+ </para>
+
+ <para>
+ Instructs <command>ndbd</command> not to start as a daemon
+ process. Useful when <command>ndbd</command> is being
+ debugged and you want output to be redirected to the
+ screen.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--nostart</option>
</para>
@@ -5993,10 +5996,8 @@
<listitem>
<para>
- <option>-f <replaceable>filename</replaceable>,
- --config-file=<replaceable>filename</replaceable></option>,
- (<emphasis role="bold">OBSOLETE</emphasis>): <option>-c
- <replaceable>filename</replaceable></option>
+ <option>--config-file=<replaceable>file_name</replaceable></option>,
+ <option>-f <replaceable>file_name</replaceable></option>,
</para>
<para>
@@ -6004,15 +6005,20 @@
use for its configuration file. This option must be
specified. The file name defaults to
<literal>config.ini</literal>.
- <emphasis role="bold">Note</emphasis>: The
- <option>-c</option> shortcut is obsolete and should
- <emphasis>not</emphasis> be used in new installations.
</para>
+
+ <para>
+ <emphasis role="bold">Note</emphasis>: This option also
+ can be given as <option>-c
+ <filename>file_name</filename></option>, but this shortcut
+ is obsolete and should <emphasis>not</emphasis> be used in
+ new installations.
+ </para>
</listitem>
<listitem>
<para>
- <option>-d</option>, <option>--daemon</option>
+ <option>--daemon</option>, <option>-d</option>
</para>
<para>
@@ -10654,12 +10660,12 @@
[js] Cut or change this item when cluster replication is
enabled.
</remark>
-
+
<para>
MySQL replication will not work correctly if updates are
done on multiple MySQL servers. However, if the database
- partitioning scheme is done at the application level, and no
- transactions take place across these partitions, then
+ partitioning scheme is done at the application level, and
+ no transactions take place across these partitions, then
replication can be made to work.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r747 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 Jan |
