Author: paul
Date: 2009-01-14 22:58:41 +0100 (Wed, 14 Jan 2009)
New Revision: 13189
Log:
r37353@frost: paul | 2009-01-14 14:16:25 -0500
General revisions
Modified:
trunk/refman-4.1/dba-security-core.xml
trunk/refman-5.0/dba-security-core.xml
trunk/refman-5.1/dba-security-core.xml
trunk/refman-6.0/dba-security-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41130
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37348
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35643
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41130
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37353
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35643
Modified: trunk/refman-4.1/dba-security-core.xml
===================================================================
--- trunk/refman-4.1/dba-security-core.xml 2009-01-14 19:43:11 UTC (rev 13188)
+++ trunk/refman-4.1/dba-security-core.xml 2009-01-14 21:58:41 UTC (rev 13189)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 14; 2806 bytes
@@ -1019,15 +1019,16 @@
<listitem>
<para>
- For the <command>mysql</command> command-line client,
+ For the <command>mysql</command> command-line client, enable
<literal role="stmt" condition="load-data">LOAD DATA
- LOCAL</literal> can be enabled by specifying the
- <option>--local-infile[=1]</option> option, or disabled with
- the <option>--local-infile=0</option> option. Similarly, for
- <command>mysqlimport</command>, the <option>--local</option>
- or <option>-L</option> option enables local data file loading.
- In any case, successful use of a local loading operation
- requires that the server is enabled to allow it.
+ LOCAL</literal> by specifying the
+ <option>--local-infile[=1]</option> option, or disable it with
+ the <option>--local-infile=0</option> option. For
+ <command>mysqlimport</command>, local data file loading is off
+ by default; enable it with the <option>--local</option> or
+ <option>-L</option> option. In any case, successful use of a
+ local load operation requires that the server is enabled to
+ allow it.
</para>
</listitem>
@@ -1056,8 +1057,8 @@
<listitem>
<para>
- If <literal role="stmt" condition="load-data">LOAD DATA LOCAL
- INFILE</literal> is disabled, either in the server or the
+ If <literal role="stmt" condition="load-data">LOAD DATA
+ LOCAL</literal> is disabled, either in the server or the
client, a client that attempts to issue such a statement
receives the following error message:
</para>
@@ -1119,7 +1120,7 @@
<listitem>
<para>
- Stop the server if it's running (use <command>mysqladmin
+ Stop the server if it is running (use <command>mysqladmin
shutdown</command>).
</para>
</listitem>
@@ -1144,9 +1145,10 @@
<para>
If directories or files within the MySQL data directory are
- symbolic links, you'll also need to follow those links and
- change the directories and files they point to. <literal>chown
- -R</literal> might not follow symbolic links for you.
+ symbolic links, <literal>chown -R</literal> might not follow
+ symbolic links for you. If it does not, you will also need to
+ follow those links and change the directories and files they
+ point to.
</para>
</listitem>
Modified: trunk/refman-5.0/dba-security-core.xml
===================================================================
--- trunk/refman-5.0/dba-security-core.xml 2009-01-14 19:43:11 UTC (rev 13188)
+++ trunk/refman-5.0/dba-security-core.xml 2009-01-14 21:58:41 UTC (rev 13189)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 14; 2806 bytes
@@ -1093,15 +1093,16 @@
<listitem>
<para>
- For the <command>mysql</command> command-line client,
+ For the <command>mysql</command> command-line client, enable
<literal role="stmt" condition="load-data">LOAD DATA
- LOCAL</literal> can be enabled by specifying the
- <option>--local-infile[=1]</option> option, or disabled with
- the <option>--local-infile=0</option> option. Similarly, for
- <command>mysqlimport</command>, the <option>--local</option>
- or <option>-L</option> option enables local data file loading.
- In any case, successful use of a local loading operation
- requires that the server is enabled to allow it.
+ LOCAL</literal> by specifying the
+ <option>--local-infile[=1]</option> option, or disable it with
+ the <option>--local-infile=0</option> option. For
+ <command>mysqlimport</command>, local data file loading is off
+ by default; enable it with the <option>--local</option> or
+ <option>-L</option> option. In any case, successful use of a
+ local load operation requires that the server is enabled to
+ allow it.
</para>
</listitem>
@@ -1125,8 +1126,8 @@
<listitem>
<para>
- If <literal role="stmt" condition="load-data">LOAD DATA LOCAL
- INFILE</literal> is disabled, either in the server or the
+ If <literal role="stmt" condition="load-data">LOAD DATA
+ LOCAL</literal> is disabled, either in the server or the
client, a client that attempts to issue such a statement
receives the following error message:
</para>
@@ -1186,7 +1187,7 @@
<listitem>
<para>
- Stop the server if it's running (use <command>mysqladmin
+ Stop the server if it is running (use <command>mysqladmin
shutdown</command>).
</para>
</listitem>
@@ -1211,9 +1212,10 @@
<para>
If directories or files within the MySQL data directory are
- symbolic links, you'll also need to follow those links and
- change the directories and files they point to. <literal>chown
- -R</literal> might not follow symbolic links for you.
+ symbolic links, <literal>chown -R</literal> might not follow
+ symbolic links for you. If it does not, you will also need to
+ follow those links and change the directories and files they
+ point to.
</para>
</listitem>
Modified: trunk/refman-5.1/dba-security-core.xml
===================================================================
--- trunk/refman-5.1/dba-security-core.xml 2009-01-14 19:43:11 UTC (rev 13188)
+++ trunk/refman-5.1/dba-security-core.xml 2009-01-14 21:58:41 UTC (rev 13189)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 14; 2806 bytes
@@ -1107,15 +1107,16 @@
<listitem>
<para>
- For the <command>mysql</command> command-line client,
+ For the <command>mysql</command> command-line client, enable
<literal role="stmt" condition="load-data">LOAD DATA
- LOCAL</literal> can be enabled by specifying the
- <option>--local-infile[=1]</option> option, or disabled with
- the <option>--local-infile=0</option> option. Similarly, for
- <command>mysqlimport</command>, the <option>--local</option>
- or <option>-L</option> option enables local data file loading.
- In any case, successful use of a local loading operation
- requires that the server is enabled to allow it.
+ LOCAL</literal> by specifying the
+ <option>--local-infile[=1]</option> option, or disable it with
+ the <option>--local-infile=0</option> option. For
+ <command>mysqlimport</command>, local data file loading is off
+ by default; enable it with the <option>--local</option> or
+ <option>-L</option> option. In any case, successful use of a
+ local load operation requires that the server is enabled to
+ allow it.
</para>
</listitem>
@@ -1139,8 +1140,8 @@
<listitem>
<para>
- If <literal role="stmt" condition="load-data">LOAD DATA LOCAL
- INFILE</literal> is disabled, either in the server or the
+ If <literal role="stmt" condition="load-data">LOAD DATA
+ LOCAL</literal> is disabled, either in the server or the
client, a client that attempts to issue such a statement
receives the following error message:
</para>
@@ -1200,7 +1201,7 @@
<listitem>
<para>
- Stop the server if it's running (use <command>mysqladmin
+ Stop the server if it is running (use <command>mysqladmin
shutdown</command>).
</para>
</listitem>
@@ -1225,9 +1226,10 @@
<para>
If directories or files within the MySQL data directory are
- symbolic links, you'll also need to follow those links and
- change the directories and files they point to. <literal>chown
- -R</literal> might not follow symbolic links for you.
+ symbolic links, <literal>chown -R</literal> might not follow
+ symbolic links for you. If it does not, you will also need to
+ follow those links and change the directories and files they
+ point to.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-security-core.xml
===================================================================
--- trunk/refman-6.0/dba-security-core.xml 2009-01-14 19:43:11 UTC (rev 13188)
+++ trunk/refman-6.0/dba-security-core.xml 2009-01-14 21:58:41 UTC (rev 13189)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 14; 2806 bytes
@@ -1103,15 +1103,16 @@
<listitem>
<para>
- For the <command>mysql</command> command-line client,
+ For the <command>mysql</command> command-line client, enable
<literal role="stmt" condition="load-data">LOAD DATA
- LOCAL</literal> can be enabled by specifying the
- <option>--local-infile[=1]</option> option, or disabled with
- the <option>--local-infile=0</option> option. Similarly, for
- <command>mysqlimport</command>, the <option>--local</option>
- or <option>-L</option> option enables local data file loading.
- In any case, successful use of a local loading operation
- requires that the server is enabled to allow it.
+ LOCAL</literal> by specifying the
+ <option>--local-infile[=1]</option> option, or disable it with
+ the <option>--local-infile=0</option> option. For
+ <command>mysqlimport</command>, local data file loading is off
+ by default; enable it with the <option>--local</option> or
+ <option>-L</option> option. In any case, successful use of a
+ local load operation requires that the server is enabled to
+ allow it.
</para>
</listitem>
@@ -1135,8 +1136,8 @@
<listitem>
<para>
- If <literal role="stmt" condition="load-data">LOAD DATA LOCAL
- INFILE</literal> is disabled, either in the server or the
+ If <literal role="stmt" condition="load-data">LOAD DATA
+ LOCAL</literal> is disabled, either in the server or the
client, a client that attempts to issue such a statement
receives the following error message:
</para>
@@ -1196,7 +1197,7 @@
<listitem>
<para>
- Stop the server if it's running (use <command>mysqladmin
+ Stop the server if it is running (use <command>mysqladmin
shutdown</command>).
</para>
</listitem>
@@ -1221,9 +1222,10 @@
<para>
If directories or files within the MySQL data directory are
- symbolic links, you'll also need to follow those links and
- change the directories and files they point to. <literal>chown
- -R</literal> might not follow symbolic links for you.
+ symbolic links, <literal>chown -R</literal> might not follow
+ symbolic links for you. If it does not, you will also need to
+ follow those links and change the directories and files they
+ point to.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13189 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 14 Jan |
