Author: paul
Date: 2009-05-08 20:51:06 +0200 (Fri, 08 May 2009)
New Revision: 14866
Log:
r41054@frost: paul | 2009-05-08 13:49:39 -0500
Reformat
Modified:
trunk/refman-4.1/mysql-cluster-optvar-core.xml
trunk/refman-4.1/mysql-cluster-programs-core.xml
trunk/refman-5.0/mysql-cluster-optvar-core.xml
trunk/refman-5.0/mysql-cluster-programs-core.xml
trunk/refman-5.1/mysql-cluster-optvar-core.xml
trunk/refman-5.1/mysql-cluster-programs-core.xml
trunk/refman-5.1/mysql-cluster-roadmap.xml
trunk/refman-6.0/dba-security-core.xml
trunk/refman-6.0/dba-user-management-core.xml
trunk/refman-6.0/programs-server-core.xml
trunk/refman-common/connector-net-core.xml
trunk/refman-common/credits.xml
trunk/refman-common/news-cluster.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41040
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41054
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
Modified: trunk/refman-4.1/mysql-cluster-optvar-core.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-optvar-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-4.1/mysql-cluster-optvar-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 930 bytes
@@ -81,8 +81,8 @@
For information about command-line options used with other MySQL
Cluster processes (<command>ndbd</command>,
<command>ndb_mgmd</command>, and <command>ndb_mgm</command>), see
- <xref linkend="mysql-cluster-program-options-common"/>. For information
- about command-line options used with
+ <xref linkend="mysql-cluster-program-options-common"/>. For
+ information about command-line options used with
<literal role="se">NDB</literal> utility programs (such as
<command>ndb_desc</command>, <command>ndb_size.pl</command>, and
<command>ndb_show_tables</command>), see
Modified: trunk/refman-4.1/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-programs-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-4.1/mysql-cluster-programs-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 5, Lines Added: 10, Lines Deleted: 7; 2367 bytes
@@ -450,7 +450,8 @@
The following list describes command options specific to the
MySQL Cluster data node program <command>ndbd</command>. For
options common to all <literal role="se">NDBCLUSTER</literal>
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -923,7 +924,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgmd</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -1045,8 +1047,8 @@
<para>
See <xref linkend="mysql-cluster-connectstring"/>, for
information about using connectstrings.
- <xref linkend="mysql-cluster-program-options-common"/>, describes
- other options for <command>ndb_mgmd</command>.
+ <xref linkend="mysql-cluster-program-options-common"/>,
+ describes other options for <command>ndb_mgmd</command>.
</para>
<para>
@@ -1260,7 +1262,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgm</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -4791,8 +4794,8 @@
<para>
For more information about <command>ndb_restore</command>, see
- <xref linkend="mysql-cluster-programs-ndb-restore"/>. For options common to
- all NDB programs, see
+ <xref linkend="mysql-cluster-programs-ndb-restore"/>. For
+ options common to all NDB programs, see
<xref linkend="mysql-cluster-program-options-common"/>.
</para>
Modified: trunk/refman-5.0/mysql-cluster-optvar-core.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-optvar-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-5.0/mysql-cluster-optvar-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 930 bytes
@@ -81,8 +81,8 @@
For information about command-line options used with other MySQL
Cluster processes (<command>ndbd</command>,
<command>ndb_mgmd</command>, and <command>ndb_mgm</command>), see
- <xref linkend="mysql-cluster-program-options-common"/>. For information
- about command-line options used with
+ <xref linkend="mysql-cluster-program-options-common"/>. For
+ information about command-line options used with
<literal role="se">NDB</literal> utility programs (such as
<command>ndb_desc</command>, <command>ndb_size.pl</command>, and
<command>ndb_show_tables</command>), see
Modified: trunk/refman-5.0/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-programs-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-5.0/mysql-cluster-programs-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 5; 1920 bytes
@@ -449,7 +449,8 @@
The following list describes command options specific to the
MySQL Cluster data node program <command>ndbd</command>. For
options common to all <literal role="se">NDBCLUSTER</literal>
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -1000,7 +1001,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgmd</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -1327,7 +1329,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgm</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -4992,8 +4995,8 @@
<para>
For more information about <command>ndb_restore</command>, see
- <xref linkend="mysql-cluster-programs-ndb-restore"/>. For options common to
- all NDB programs, see
+ <xref linkend="mysql-cluster-programs-ndb-restore"/>. For
+ options common to all NDB programs, see
<xref linkend="mysql-cluster-program-options-common"/>.
</para>
Modified: trunk/refman-5.1/mysql-cluster-optvar-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-optvar-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-5.1/mysql-cluster-optvar-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 930 bytes
@@ -81,8 +81,8 @@
For information about command-line options used with other MySQL
Cluster processes (<command>ndbd</command>,
<command>ndb_mgmd</command>, and <command>ndb_mgm</command>), see
- <xref linkend="mysql-cluster-program-options-common"/>. For information
- about command-line options used with
+ <xref linkend="mysql-cluster-program-options-common"/>. For
+ information about command-line options used with
<literal role="se">NDB</literal> utility programs (such as
<command>ndb_desc</command>, <command>ndb_size.pl</command>, and
<command>ndb_show_tables</command>), see
Modified: trunk/refman-5.1/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-programs-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-5.1/mysql-cluster-programs-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 4; 1477 bytes
@@ -1471,7 +1471,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgmd</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -1964,7 +1965,8 @@
<para>
The following list includes options that are specific to
<command>ndb_mgm</command>. For options common to all NDB
- programs, see <xref linkend="mysql-cluster-program-options-common"/>.
+ programs, see
+ <xref linkend="mysql-cluster-program-options-common"/>.
</para>
<itemizedlist>
@@ -6332,8 +6334,8 @@
<para>
For more information about <command>ndb_restore</command>, see
- <xref linkend="mysql-cluster-programs-ndb-restore"/>. For options common to
- all NDB programs, see
+ <xref linkend="mysql-cluster-programs-ndb-restore"/>. For
+ options common to all NDB programs, see
<xref linkend="mysql-cluster-program-options-common"/>.
</para>
Modified: trunk/refman-5.1/mysql-cluster-roadmap.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-roadmap.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-5.1/mysql-cluster-roadmap.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 744 bytes
@@ -1248,8 +1248,8 @@
restored to a <literal role="type">MEDIUMINT</literal>,
<literal role="type">INT</literal>, or
<literal role="type">BIGINT</literal> column. See
- <xref linkend="mysql-cluster-programs-ndb-restore"/>, for more
- information.
+ <xref linkend="mysql-cluster-programs-ndb-restore"/>, for
+ more information.
</para>
</formalpara>
Modified: trunk/refman-6.0/dba-security-core.xml
===================================================================
--- trunk/refman-6.0/dba-security-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-6.0/dba-security-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 12; 2019 bytes
@@ -848,12 +848,11 @@
<para>
This option limits the effect of the
- <literal role="stmt">BACKUP
- DATABASE</literal> and <literal role="stmt">RESTORE</literal>
- statements to work only with files in the specified directory.
-This option
-was added in MySQL 6.0.11; in older releases, use
-<option role="mysqld">--secure-file-priv</option> instead.
+ <literal role="stmt">BACKUP DATABASE</literal> and
+ <literal role="stmt">RESTORE</literal> statements to work only
+ with files in the specified directory. This option was added
+ in MySQL 6.0.11; in older releases, use
+ <option role="mysqld">--secure-file-priv</option> instead.
</para>
</listitem>
@@ -879,12 +878,13 @@
<literal role="func">LOAD_FILE()</literal> function and the
<literal role="stmt">LOAD DATA</literal> and
<literal role="stmt" condition="select">SELECT ... INTO
- OUTFILE</literal>
- statements to work only with files in the specified directory.
-Before MySQL 6.0.11, it also applies to the <literal role="stmt">BACKUP
- DATABASE</literal> and <literal role="stmt">RESTORE</literal>
-statements; as of 6.0.11,
-<option role="mysqld">--secure-backup-file-priv</option> applies to those statements.
+ OUTFILE</literal> statements to work only with files in the
+ specified directory. Before MySQL 6.0.11, it also applies to
+ the <literal role="stmt">BACKUP DATABASE</literal> and
+ <literal role="stmt">RESTORE</literal> statements; as of
+ 6.0.11,
+ <option role="mysqld">--secure-backup-file-priv</option>
+ applies to those statements.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-user-management-core.xml
===================================================================
--- trunk/refman-6.0/dba-user-management-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-6.0/dba-user-management-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 757 bytes
@@ -1717,8 +1717,7 @@
<literal role="stmt">GRANT</literal>, or
<literal role="stmt">SET PASSWORD</literal>. This is the
behavior that occurs if you have upgraded to 4.1 but have
- not yet run the
- <command>mysql_upgrade</command> program to
+ not yet run the <command>mysql_upgrade</command> program to
widen the <literal>Password</literal> column.
</para>
</listitem>
Modified: trunk/refman-6.0/programs-server-core.xml
===================================================================
--- trunk/refman-6.0/programs-server-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-6.0/programs-server-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 4; 939 bytes
@@ -202,8 +202,7 @@
<para condition="dynamic:optvar:commandoptions" role="6.0:mysqld_safe:all"/>
<para>
- <command>mysqld_safe</command>
- supports the options in the
+ <command>mysqld_safe</command> supports the options in the
following list. It also reads option files and supports the
options for processing them described at
<xref linkend="option-file-options"/>.
@@ -1039,8 +1038,7 @@
</para>
<para>
- <command>mysql.server</command> supports the following
- options:
+ <command>mysql.server</command> supports the following options:
</para>
<itemizedlist>
Modified: trunk/refman-common/connector-net-core.xml
===================================================================
--- trunk/refman-common/connector-net-core.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-common/connector-net-core.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 329 bytes
@@ -168,5 +168,4 @@
</section>
-
</section>
Modified: trunk/refman-common/credits.xml
===================================================================
--- trunk/refman-common/credits.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-common/credits.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 14; 2364 bytes
@@ -24,11 +24,12 @@
</indexterm>
<para>
- Although Sun Microsystems, Inc. owns all copyrights in the <literal>MySQL
- server</literal> and the <literal>MySQL manual</literal>, we wish
- to recognize those who have made contributions of one kind or
- another to the <literal>MySQL distribution</literal>. Contributors
- are listed here, in somewhat random order:
+ Although Sun Microsystems, Inc. owns all copyrights in the
+ <literal>MySQL server</literal> and the <literal>MySQL
+ manual</literal>, we wish to recognize those who have made
+ contributions of one kind or another to the <literal>MySQL
+ distribution</literal>. Contributors are listed here, in somewhat
+ random order:
</para>
<itemizedlist>
@@ -530,9 +531,9 @@
</para>
<para>
- We wish to recognize Google Inc. for contributions to the MySQL
- distribution: Mark Callaghan's SMP Performance patches and other
- patches.
+ We wish to recognize Google Inc. for contributions to the
+ MySQL distribution: Mark Callaghan's SMP Performance patches
+ and other patches.
</para>
</listitem>
@@ -1288,12 +1289,13 @@
</indexterm>
<para>
- Although Sun Microsystems, Inc. owns all copyrights in the <literal>MySQL
- server</literal> and the <literal>MySQL manual</literal>, we wish
- to recognize the following companies, which helped us finance the
- development of the <literal>MySQL server</literal>, such as by
- paying us for developing a new feature or giving us hardware for
- development of the <literal>MySQL server</literal>.
+ Although Sun Microsystems, Inc. owns all copyrights in the
+ <literal>MySQL server</literal> and the <literal>MySQL
+ manual</literal>, we wish to recognize the following companies,
+ which helped us finance the development of the <literal>MySQL
+ server</literal>, such as by paying us for developing a new
+ feature or giving us hardware for development of the
+ <literal>MySQL server</literal>.
</para>
<itemizedlist>
Modified: trunk/refman-common/news-cluster.xml
===================================================================
--- trunk/refman-common/news-cluster.xml 2009-05-08 18:40:09 UTC (rev 14865)
+++ trunk/refman-common/news-cluster.xml 2009-05-08 18:51:06 UTC (rev 14866)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 665 bytes
@@ -1026,8 +1026,8 @@
<para>
The ndb executables have been changed to make use of the
regular MySQL command-line option parsing features. See
- <xref linkend="mysql-cluster-program-options-common"/>, for notes on
- changes.
+ <xref linkend="mysql-cluster-program-options-common"/>, for
+ notes on changes.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r14866 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 refman-common | paul.dubois | 8 May |
