Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3143 05/07/31 00:24:55 paul@stripped +12 -0
Replace tags.
refman/ndbcluster.xml
1.15 05/07/31 00:24:14 paul@stripped +26 -26
Replace tags.
refman/functions.xml
1.18 05/07/31 00:24:12 paul@stripped +4 -4
Replace tags.
refman/credits.xml
1.6 05/07/31 00:24:11 paul@stripped +3 -3
Replace tags.
refman/charset.xml
1.10 05/07/31 00:24:10 paul@stripped +11 -11
Replace tags.
refman-5.0/ndbcluster.xml
1.25 05/07/31 00:24:09 paul@stripped +10 -10
Sync.
refman-5.0/functions.xml
1.22 05/07/31 00:24:08 paul@stripped +3 -3
Sync.
refman-5.0/credits.xml
1.6 05/07/31 00:24:07 paul@stripped +3 -3
Sync.
refman-5.0/charset.xml
1.11 05/07/31 00:24:06 paul@stripped +11 -11
Sync.
refman-4.1/ndbcluster.xml
1.15 05/07/31 00:24:05 paul@stripped +26 -26
Sync.
refman-4.1/functions.xml
1.19 05/07/31 00:24:03 paul@stripped +4 -4
Sync.
refman-4.1/credits.xml
1.6 05/07/31 00:24:02 paul@stripped +3 -3
Sync.
refman-4.1/charset.xml
1.8 05/07/31 00:24:02 paul@stripped +11 -11
Sync.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: frost.snake.net
# Root: /Volumes/frost2/MySQL/bk/mysqldoc
--- 1.7/refman-4.1/charset.xml 2005-07-26 22:27:49 -04:00
+++ 1.8/refman-4.1/charset.xml 2005-07-31 00:24:02 -04:00
@@ -405,15 +405,15 @@
At the server level, the decision is simple. The server
character set and collation depend initially on the options that
you use when you start <command>mysqld</command>. You can use
- <literal>--default-character-set</literal> for the character
- set, and along with it you can add
- <literal>--default-collation</literal> for the collation. If you
+ <option>--default-character-set</option> for the character set,
+ and along with it you can add
+ <option>--default-collation</option> for the collation. If you
don't specify a character set, that is the same as saying
- <literal>--default-character-set=latin1</literal>. If you
- specify only a character set (for example,
- <literal>latin1</literal>) but not a collation, that is the same
- as saying <literal>--default-charset=latin1</literal>
- <literal>--default-collation=latin1_swedish_ci</literal> because
+ <option>--default-character-set=latin1</option>. If you specify
+ only a character set (for example, <literal>latin1</literal>)
+ but not a collation, that is the same as saying
+ <option>--default-charset=latin1</option>
+ <option>--default-collation=latin1_swedish_ci</option> because
<literal>latin1_swedish_ci</literal> is the default collation
for <literal>latin1</literal>. Therefore, the following three
commands all have the same effect:
@@ -429,8 +429,8 @@
<para>
One way to change the settings is by recompiling. If you want to
change the default server character set and collation when
- building from sources, use: <literal>--with-charset</literal>
- and <literal>--with-collation</literal> as arguments for
+ building from sources, use: <option>--with-charset</option> and
+ <option>--with-collation</option> as arguments for
<command>configure</command>. For example:
</para>
@@ -970,7 +970,7 @@
With the <command>mysql</command> client, it is not necessary to
execute <literal>SET NAMES</literal> every time you start up if
you want to use a character set different from the default. You
- can add the <literal>--default-character-set</literal> option
+ can add the <option>--default-character-set</option> option
setting to your <command>mysql</command> statement line, or in
your option file. For example, the following option file setting
changes the three character set variables set to
--- 1.5/refman-4.1/credits.xml 2005-07-19 11:57:14 -04:00
+++ 1.6/refman-4.1/credits.xml 2005-07-31 00:24:02 -04:00
@@ -284,7 +284,7 @@
<listitem>
<para>
- <literal>--max-user-connections=...</literal> option
+ <option>--max-user-connections=...</option> option
</para>
</listitem>
@@ -2164,7 +2164,7 @@
<para>
For his safe_malloc (memory checker) package which is used in
- when you configure MySQL with <literal>--debug</literal>.
+ when you configure MySQL with <option>--debug</option>.
</para>
</listitem>
@@ -2457,7 +2457,7 @@
</para>
<para>
- <literal>--skip-show-database</literal>
+ <option>--skip-show-database</option>
</para>
</listitem>
--- 1.18/refman-4.1/functions.xml 2005-07-30 23:58:41 -04:00
+++ 1.19/refman-4.1/functions.xml 2005-07-31 00:24:03 -04:00
@@ -54,7 +54,7 @@
<para>
You can tell the MySQL server to accept spaces after function names
- by starting it with the <literal>--sql-mode=IGNORE_SPACE</literal>
+ by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
option. Individual client programs can request this behavior by
using the <literal>CLIENT_IGNORE_SPACE</literal> option for
<literal>mysql_real_connect()</literal>. In either case, all
@@ -9761,7 +9761,7 @@
<para>
If you have a problem with <literal>UNSIGNED</literal> columns in
old MySQL applications when porting them to MySQL 4.0, you can use
- the <literal>--sql-mode=NO_UNSIGNED_SUBTRACTION</literal> option
+ the <option>--sql-mode=NO_UNSIGNED_SUBTRACTION</option> option
when starting <command>mysqld</command>. However, as long as you
use this option, you are not able to make efficient use of the
<literal>BIGINT UNSIGNED</literal> column type.
@@ -10231,7 +10231,7 @@
key from the DES key file to decrypt the message. For this
to work, the user must have the <literal>SUPER</literal>
privilege. The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
@@ -10311,7 +10311,7 @@
<para>
The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
--- 1.14/refman-4.1/ndbcluster.xml 2005-07-30 23:58:48 -04:00
+++ 1.15/refman-4.1/ndbcluster.xml 2005-07-31 00:24:05 -04:00
@@ -981,7 +981,7 @@
<para>
Note that <command>ndb_mgmd</command> must be told where to
find its configuration file, using the <literal>-f</literal>
- or <literal>--config-file</literal> option. (See
+ or <option>--config-file</option> option. (See
<xref linkend="ndb-mgmd-process"/> for details.)
</para>
</listitem>
@@ -998,7 +998,7 @@
<para>
Note that it is very important to use the
- <literal>--initial</literal> parameter
+ <option>--initial</option> parameter
<emphasis role="bold">only</emphasis> when starting
<command>ndbd</command> for the first time, or when
restarting after backup/restore or configuration change.
@@ -1442,7 +1442,7 @@
<para>
Remember <emphasis role="bold">not</emphasis> to invoke this
- command with the <literal>--initial</literal> option when
+ command with the <option>--initial</option> option when
restarting an NDBD node normally.
</para>
</listitem>
@@ -1636,7 +1636,7 @@
Then start a single DB node by running <command>ndbd</command>.
When starting <command>ndbd</command> for a given DB node for
the very first time, you should use the
- <literal>--initial</literal> option as shown here:
+ <option>--initial</option> option as shown here:
</para>
<programlisting>
@@ -1654,7 +1654,7 @@
</programlisting>
<para>
- This is because the <literal>--initial</literal> option will
+ This is because the <option>--initial</option> option will
delete all existing data and log files (as well as all table
metadata) for this data node and create new ones. One exception
to this rule is when restarting the cluster and restoring from
@@ -1913,7 +1913,7 @@
named <filename>config.ini</filename> by default. It is read
by <command>ndb_mgmd</command> at startup and can be placed
anywhere. Its location and name are specified by using
-
<literal>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></literal>
+
<option>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></option>
on the command line with <command>ndb_mgmd</command>. If the
configuration file is not specified,
<command>ndb_mgmd</command> will by default try to read a
@@ -2027,7 +2027,7 @@
<literal>[SHM]</literal>: Defines shared-memory
connections between nodes. Prior to MySQL 4.1.9, this type
of connection was available only in binaries that were
- built using the <literal>--with-ndb-shm</literal> option.
+ built using the <option>--with-ndb-shm</option> option.
Beginning with MySQL 4.1.9-max, it is enabled by default,
but should still be considered experimental.
</para>
@@ -4880,9 +4880,9 @@
runs concurrently on the same cluster host. (In previous
versions of MySQL Cluster, shared memory segments were
supported only when the <literal>-max</literal> binary was
- built using <literal>--with-ndb-shm</literal>.) When
- explicitly defining shared memory as the connection method it
- is necessary to define at least <literal>NodeId1</literal>,
+ built using <option>--with-ndb-shm</option>.) When explicitly
+ defining shared memory as the connection method it is
+ necessary to define at least <literal>NodeId1</literal>,
<literal>NodeId2</literal> and
<literal>ShmKey</literal>. All
other parameters have default values that will work out fine
in most cases.
@@ -4978,7 +4978,7 @@
<para>
Using SCI transporters to connect nodes in a MySQL Cluster is
supported only when the MySQL-max binaries are built using
- <literal>--with-ndb-sci=/your/path/to/SCI</literal>. The
+ <option>--with-ndb-sci=/your/path/to/SCI</option>. The
<replaceable>path</replaceable> should point to a directory
that contains at a minimum <filename>lib</filename> and
<filename>include</filename> directories containing SISCI
@@ -5661,7 +5661,7 @@
<listitem>
<para>
-
<literal>--debug[=<replaceable>options</replaceable>]</literal>
+
<option>--debug[=<replaceable>options</replaceable>]</option>
</para>
<para>
@@ -5674,7 +5674,7 @@
<listitem>
<para>
- <literal>-e</literal>, <literal>--execute</literal>
+ <literal>-e</literal>, <option>--execute</option>
</para>
<para>
@@ -5712,7 +5712,7 @@
<listitem>
<para>
- <literal>--ndbcluster</literal>
+ <option>--ndbcluster</option>
</para>
<para>
@@ -5726,7 +5726,7 @@
<listitem>
<para>
- <literal>--skip-ndbcluster</literal>
+ <option>--skip-ndbcluster</option>
</para>
<para>
@@ -5739,7 +5739,7 @@
<listitem>
<para>
-
<literal>--ndb-connectstring=<replaceable>connect_string</replaceable></literal>
+
<option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
</para>
<para>
@@ -5778,7 +5778,7 @@
<listitem>
<para>
- <literal>--nodaemon</literal>
+ <option>--nodaemon</option>
</para>
<para>
@@ -5790,7 +5790,7 @@
<listitem>
<para>
- <literal>--initial</literal>
+ <option>--initial</option>
</para>
<para>
@@ -5803,10 +5803,10 @@
</para>
<para>
- An <literal>--initial</literal> start is to be used only
- the very first time that the <command>ndbd</command>
- process is started, as it removes all files from the
- Cluster filesystem and re-creates all REDO log files. The
+ An <option>--initial</option> start is to be used only the
+ very first time that the <command>ndbd</command> process
+ is started, as it removes all files from the Cluster
+ filesystem and re-creates all REDO log files. The
exceptions to this rule are:
</para>
@@ -5854,7 +5854,7 @@
<listitem>
<para>
- <literal>--nostart</literal>
+ <option>--nostart</option>
</para>
<para>
@@ -5957,7 +5957,7 @@
<listitem>
<para>
-
<literal>--try-reconnect=<replaceable>number</replaceable></literal>
+
<option>--try-reconnect=<replaceable>number</replaceable></option>
</para>
<para>
@@ -8601,8 +8601,8 @@
engine-condition-pushdown=On;</literal> command.
Alternatively, you can run <command>mysqld</command> with
the this feature enabled by starting the MySQL server with
- the new <literal>--engine-condition-pushdown</literal>
- option flag.
+ the new <option>--engine-condition-pushdown</option> option
+ flag.
</para>
<para>
--- 1.10/refman-5.0/charset.xml 2005-07-26 22:27:49 -04:00
+++ 1.11/refman-5.0/charset.xml 2005-07-31 00:24:06 -04:00
@@ -403,15 +403,15 @@
At the server level, the decision is simple. The server
character set and collation depend initially on the options that
you use when you start <command>mysqld</command>. You can use
- <literal>--default-character-set</literal> for the character
- set, and along with it you can add
- <literal>--default-collation</literal> for the collation. If you
+ <option>--default-character-set</option> for the character set,
+ and along with it you can add
+ <option>--default-collation</option> for the collation. If you
don't specify a character set, that is the same as saying
- <literal>--default-character-set=latin1</literal>. If you
- specify only a character set (for example,
- <literal>latin1</literal>) but not a collation, that is the same
- as saying <literal>--default-charset=latin1</literal>
- <literal>--default-collation=latin1_swedish_ci</literal> because
+ <option>--default-character-set=latin1</option>. If you specify
+ only a character set (for example, <literal>latin1</literal>)
+ but not a collation, that is the same as saying
+ <option>--default-charset=latin1</option>
+ <option>--default-collation=latin1_swedish_ci</option> because
<literal>latin1_swedish_ci</literal> is the default collation
for <literal>latin1</literal>. Therefore, the following three
commands all have the same effect:
@@ -427,8 +427,8 @@
<para>
One way to change the settings is by recompiling. If you want to
change the default server character set and collation when
- building from sources, use: <literal>--with-charset</literal>
- and <literal>--with-collation</literal> as arguments for
+ building from sources, use: <option>--with-charset</option> and
+ <option>--with-collation</option> as arguments for
<command>configure</command>. For example:
</para>
@@ -972,7 +972,7 @@
With the <command>mysql</command> client, it is not necessary to
execute <literal>SET NAMES</literal> every time you start up if
you want to use a character set different from the default. You
- can add the <literal>--default-character-set</literal> option
+ can add the <option>--default-character-set</option> option
setting to your <command>mysql</command> statement line, or in
your option file. For example, the following option file setting
changes the three character set variables set to
--- 1.5/refman-5.0/credits.xml 2005-07-19 11:57:28 -04:00
+++ 1.6/refman-5.0/credits.xml 2005-07-31 00:24:07 -04:00
@@ -284,7 +284,7 @@
<listitem>
<para>
- <literal>--max-user-connections=...</literal> option
+ <option>--max-user-connections=...</option> option
</para>
</listitem>
@@ -2164,7 +2164,7 @@
<para>
For his safe_malloc (memory checker) package which is used in
- when you configure MySQL with <literal>--debug</literal>.
+ when you configure MySQL with <option>--debug</option>.
</para>
</listitem>
@@ -2457,7 +2457,7 @@
</para>
<para>
- <literal>--skip-show-database</literal>
+ <option>--skip-show-database</option>
</para>
</listitem>
--- 1.21/refman-5.0/functions.xml 2005-07-30 23:58:51 -04:00
+++ 1.22/refman-5.0/functions.xml 2005-07-31 00:24:08 -04:00
@@ -54,7 +54,7 @@
<para>
You can tell the MySQL server to accept spaces after function names
- by starting it with the <literal>--sql-mode=IGNORE_SPACE</literal>
+ by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
option. Individual client programs can request this behavior by
using the <literal>CLIENT_IGNORE_SPACE</literal> option for
<literal>mysql_real_connect()</literal>. In either case, all
@@ -9967,7 +9967,7 @@
key from the DES key file to decrypt the message. For this
to work, the user must have the <literal>SUPER</literal>
privilege. The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
@@ -10043,7 +10043,7 @@
<para>
The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
--- 1.24/refman-5.0/ndbcluster.xml 2005-07-30 23:59:29 -04:00
+++ 1.25/refman-5.0/ndbcluster.xml 2005-07-31 00:24:09 -04:00
@@ -982,7 +982,7 @@
<para>
Note that <command>ndb_mgmd</command> must be told where to
find its configuration file, using the <literal>-f</literal>
- or <literal>--config-file</literal> option. (See
+ or <option>--config-file</option> option. (See
<xref linkend="ndb-mgmd-process"/> for details.)
</para>
</listitem>
@@ -999,7 +999,7 @@
<para>
Note that it is very important to use the
- <literal>--initial</literal> parameter
+ <option>--initial</option> parameter
<emphasis role="bold">only</emphasis> when starting
<command>ndbd</command> for the first time, or when
restarting after backup/restore or configuration change.
@@ -1466,7 +1466,7 @@
<para>
Remember <emphasis role="bold">not</emphasis> to invoke this
- command with the <literal>--initial</literal> option when
+ command with the <option>--initial</option> option when
restarting an NDBD node normally.
</para>
</listitem>
@@ -1660,7 +1660,7 @@
Then start a single DB node by running <command>ndbd</command>.
When starting <command>ndbd</command> for a given DB node for
the very first time, you should use the
- <literal>--initial</literal> option as shown here:
+ <option>--initial</option> option as shown here:
</para>
<programlisting>
@@ -1678,7 +1678,7 @@
</programlisting>
<para>
- This is because the <literal>--initial</literal> option will
+ This is because the <option>--initial</option> option will
delete all existing data and log files (as well as all table
metadata) for this data node and create new ones. One exception
to this rule is when restarting the cluster and restoring from
@@ -1926,7 +1926,7 @@
named <filename>config.ini</filename> by default. It is read
by <command>ndb_mgmd</command> at startup and can be placed
anywhere. Its location and name are specified by using
-
<literal>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></literal>
+
<option>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></option>
on the command line with <command>ndb_mgmd</command>. If the
configuration file is not specified,
<command>ndb_mgmd</command> by default tries to read a
@@ -5690,7 +5690,7 @@
<listitem>
<para>
-
<literal>--debug[=<replaceable>options</replaceable>]</literal>
+
<option>--debug[=<replaceable>options</replaceable>]</option>
</para>
<para>
@@ -5703,7 +5703,7 @@
<listitem>
<para>
- <literal>-e</literal>, <literal>--execute</literal>
+ <literal>-e</literal>, <option>--execute</option>
</para>
<para>
@@ -8870,8 +8870,8 @@
engine-condition-pushdown=On;</literal> command.
Alternatively, you can run <command>mysqld</command> with
the this feature enabled by starting the MySQL server with
- the new <literal>--engine-condition-pushdown</literal>
- option flag.
+ the new <option>--engine-condition-pushdown</option> option
+ flag.
</para>
<para>
--- 1.9/refman/charset.xml 2005-07-26 22:27:49 -04:00
+++ 1.10/refman/charset.xml 2005-07-31 00:24:10 -04:00
@@ -405,15 +405,15 @@
At the server level, the decision is simple. The server
character set and collation depend initially on the options that
you use when you start <command>mysqld</command>. You can use
- <literal>--default-character-set</literal> for the character
- set, and along with it you can add
- <literal>--default-collation</literal> for the collation. If you
+ <option>--default-character-set</option> for the character set,
+ and along with it you can add
+ <option>--default-collation</option> for the collation. If you
don't specify a character set, that is the same as saying
- <literal>--default-character-set=latin1</literal>. If you
- specify only a character set (for example,
- <literal>latin1</literal>) but not a collation, that is the same
- as saying <literal>--default-charset=latin1</literal>
- <literal>--default-collation=latin1_swedish_ci</literal> because
+ <option>--default-character-set=latin1</option>. If you specify
+ only a character set (for example, <literal>latin1</literal>)
+ but not a collation, that is the same as saying
+ <option>--default-charset=latin1</option>
+ <option>--default-collation=latin1_swedish_ci</option> because
<literal>latin1_swedish_ci</literal> is the default collation
for <literal>latin1</literal>. Therefore, the following three
commands all have the same effect:
@@ -429,8 +429,8 @@
<para>
One way to change the settings is by recompiling. If you want to
change the default server character set and collation when
- building from sources, use: <literal>--with-charset</literal>
- and <literal>--with-collation</literal> as arguments for
+ building from sources, use: <option>--with-charset</option> and
+ <option>--with-collation</option> as arguments for
<command>configure</command>. For example:
</para>
@@ -970,7 +970,7 @@
With the <command>mysql</command> client, it is not necessary to
execute <literal>SET NAMES</literal> every time you start up if
you want to use a character set different from the default. You
- can add the <literal>--default-character-set</literal> option
+ can add the <option>--default-character-set</option> option
setting to your <command>mysql</command> statement line, or in
your option file. For example, the following option file setting
changes the three character set variables set to
--- 1.5/refman/credits.xml 2005-07-19 11:57:38 -04:00
+++ 1.6/refman/credits.xml 2005-07-31 00:24:11 -04:00
@@ -284,7 +284,7 @@
<listitem>
<para>
- <literal>--max-user-connections=...</literal> option
+ <option>--max-user-connections=...</option> option
</para>
</listitem>
@@ -2164,7 +2164,7 @@
<para>
For his safe_malloc (memory checker) package which is used in
- when you configure MySQL with <literal>--debug</literal>.
+ when you configure MySQL with <option>--debug</option>.
</para>
</listitem>
@@ -2457,7 +2457,7 @@
</para>
<para>
- <literal>--skip-show-database</literal>
+ <option>--skip-show-database</option>
</para>
</listitem>
--- 1.17/refman/functions.xml 2005-07-30 23:59:32 -04:00
+++ 1.18/refman/functions.xml 2005-07-31 00:24:12 -04:00
@@ -54,7 +54,7 @@
<para>
You can tell the MySQL server to accept spaces after function names
- by starting it with the <literal>--sql-mode=IGNORE_SPACE</literal>
+ by starting it with the <option>--sql-mode=IGNORE_SPACE</option>
option. Individual client programs can request this behavior by
using the <literal>CLIENT_IGNORE_SPACE</literal> option for
<literal>mysql_real_connect()</literal>. In either case, all
@@ -9765,7 +9765,7 @@
<para>
If you have a problem with <literal>UNSIGNED</literal> columns in
old MySQL applications when porting them to MySQL 4.0, you can use
- the <literal>--sql-mode=NO_UNSIGNED_SUBTRACTION</literal> option
+ the <option>--sql-mode=NO_UNSIGNED_SUBTRACTION</option> option
when starting <command>mysqld</command>. However, as long as you
use this option, you are not able to make efficient use of the
<literal>BIGINT UNSIGNED</literal> column type.
@@ -10235,7 +10235,7 @@
key from the DES key file to decrypt the message. For this
to work, the user must have the <literal>SUPER</literal>
privilege. The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
@@ -10315,7 +10315,7 @@
<para>
The key file can be specified with the
- <literal>--des-key-file</literal> server option.
+ <option>--des-key-file</option> server option.
</para>
<para>
--- 1.14/refman/ndbcluster.xml 2005-07-31 00:00:10 -04:00
+++ 1.15/refman/ndbcluster.xml 2005-07-31 00:24:14 -04:00
@@ -981,7 +981,7 @@
<para>
Note that <command>ndb_mgmd</command> must be told where to
find its configuration file, using the <literal>-f</literal>
- or <literal>--config-file</literal> option. (See
+ or <option>--config-file</option> option. (See
<xref linkend="ndb-mgmd-process"/> for details.)
</para>
</listitem>
@@ -998,7 +998,7 @@
<para>
Note that it is very important to use the
- <literal>--initial</literal> parameter
+ <option>--initial</option> parameter
<emphasis role="bold">only</emphasis> when starting
<command>ndbd</command> for the first time, or when
restarting after backup/restore or configuration change.
@@ -1442,7 +1442,7 @@
<para>
Remember <emphasis role="bold">not</emphasis> to invoke this
- command with the <literal>--initial</literal> option when
+ command with the <option>--initial</option> option when
restarting an NDBD node normally.
</para>
</listitem>
@@ -1636,7 +1636,7 @@
Then start a single DB node by running <command>ndbd</command>.
When starting <command>ndbd</command> for a given DB node for
the very first time, you should use the
- <literal>--initial</literal> option as shown here:
+ <option>--initial</option> option as shown here:
</para>
<programlisting>
@@ -1654,7 +1654,7 @@
</programlisting>
<para>
- This is because the <literal>--initial</literal> option will
+ This is because the <option>--initial</option> option will
delete all existing data and log files (as well as all table
metadata) for this data node and create new ones. One exception
to this rule is when restarting the cluster and restoring from
@@ -1913,7 +1913,7 @@
named <filename>config.ini</filename> by default. It is read
by <command>ndb_mgmd</command> at startup and can be placed
anywhere. Its location and name are specified by using
-
<literal>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></literal>
+
<option>--config-file=[<replaceable><path></replaceable>]<replaceable><filename></replaceable></option>
on the command line with <command>ndb_mgmd</command>. If the
configuration file is not specified,
<command>ndb_mgmd</command> will by default try to read a
@@ -2027,7 +2027,7 @@
<literal>[SHM]</literal>: Defines shared-memory
connections between nodes. Prior to MySQL 4.1.9, this type
of connection was available only in binaries that were
- built using the <literal>--with-ndb-shm</literal> option.
+ built using the <option>--with-ndb-shm</option> option.
Beginning with MySQL 4.1.9-max, it is enabled by default,
but should still be considered experimental.
</para>
@@ -4880,9 +4880,9 @@
runs concurrently on the same cluster host. (In previous
versions of MySQL Cluster, shared memory segments were
supported only when the <literal>-max</literal> binary was
- built using <literal>--with-ndb-shm</literal>.) When
- explicitly defining shared memory as the connection method it
- is necessary to define at least <literal>NodeId1</literal>,
+ built using <option>--with-ndb-shm</option>.) When explicitly
+ defining shared memory as the connection method it is
+ necessary to define at least <literal>NodeId1</literal>,
<literal>NodeId2</literal> and
<literal>ShmKey</literal>. All
other parameters have default values that will work out fine
in most cases.
@@ -4978,7 +4978,7 @@
<para>
Using SCI transporters to connect nodes in a MySQL Cluster is
supported only when the MySQL-max binaries are built using
- <literal>--with-ndb-sci=/your/path/to/SCI</literal>. The
+ <option>--with-ndb-sci=/your/path/to/SCI</option>. The
<replaceable>path</replaceable> should point to a directory
that contains at a minimum <filename>lib</filename> and
<filename>include</filename> directories containing SISCI
@@ -5661,7 +5661,7 @@
<listitem>
<para>
-
<literal>--debug[=<replaceable>options</replaceable>]</literal>
+
<option>--debug[=<replaceable>options</replaceable>]</option>
</para>
<para>
@@ -5674,7 +5674,7 @@
<listitem>
<para>
- <literal>-e</literal>, <literal>--execute</literal>
+ <literal>-e</literal>, <option>--execute</option>
</para>
<para>
@@ -5712,7 +5712,7 @@
<listitem>
<para>
- <literal>--ndbcluster</literal>
+ <option>--ndbcluster</option>
</para>
<para>
@@ -5726,7 +5726,7 @@
<listitem>
<para>
- <literal>--skip-ndbcluster</literal>
+ <option>--skip-ndbcluster</option>
</para>
<para>
@@ -5739,7 +5739,7 @@
<listitem>
<para>
-
<literal>--ndb-connectstring=<replaceable>connect_string</replaceable></literal>
+
<option>--ndb-connectstring=<replaceable>connect_string</replaceable></option>
</para>
<para>
@@ -5778,7 +5778,7 @@
<listitem>
<para>
- <literal>--nodaemon</literal>
+ <option>--nodaemon</option>
</para>
<para>
@@ -5790,7 +5790,7 @@
<listitem>
<para>
- <literal>--initial</literal>
+ <option>--initial</option>
</para>
<para>
@@ -5803,10 +5803,10 @@
</para>
<para>
- An <literal>--initial</literal> start is to be used only
- the very first time that the <command>ndbd</command>
- process is started, as it removes all files from the
- Cluster filesystem and re-creates all REDO log files. The
+ An <option>--initial</option> start is to be used only the
+ very first time that the <command>ndbd</command> process
+ is started, as it removes all files from the Cluster
+ filesystem and re-creates all REDO log files. The
exceptions to this rule are:
</para>
@@ -5854,7 +5854,7 @@
<listitem>
<para>
- <literal>--nostart</literal>
+ <option>--nostart</option>
</para>
<para>
@@ -5957,7 +5957,7 @@
<listitem>
<para>
-
<literal>--try-reconnect=<replaceable>number</replaceable></literal>
+
<option>--try-reconnect=<replaceable>number</replaceable></option>
</para>
<para>
@@ -8601,8 +8601,8 @@
engine-condition-pushdown=On;</literal> command.
Alternatively, you can run <command>mysqld</command> with
the this feature enabled by starting the MySQL server with
- the new <literal>--engine-condition-pushdown</literal>
- option flag.
+ the new <option>--engine-condition-pushdown</option> option
+ flag.
</para>
<para>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3143) | paul | 31 Jul |