Author: paul
Date: 2009-06-08 20:24:19 +0200 (Mon, 08 Jun 2009)
New Revision: 15248
Log:
r41977@frost: paul | 2009-06-08 11:00:26 -0500
Add XREF from INSTALL PLUGIN section to plugin startup options section
Modified:
trunk/refman-5.1-maria/sql-syntax-server-administration.xml
trunk/refman-5.1/dba-mysqld-server-core.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-5.4/sql-syntax-server-administration.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41965
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38756
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41977
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38756
Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml 2009-06-08 16:33:48 UTC (rev 15247)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml 2009-06-08 18:24:19 UTC (rev 15248)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 658 bytes
@@ -3305,7 +3305,7 @@
</para>
<para>
- If you upgrade to MySQL 5.1.36 or later from an older version, and
+ If you upgrade to MySQL 5.1.36 or later from an older version and
previously used options of the form
<option>--<replaceable>plugin_name</replaceable>=0</option> or
<option>--<replaceable>plugin_name</replaceable>=1</option>, the
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2009-06-08 16:33:48 UTC (rev 15247)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2009-06-08 18:24:19 UTC (rev 15248)
Changed blocks: 3, Lines Added: 11, Lines Deleted: 12; 2025 bytes
@@ -573,13 +573,11 @@
</programlisting>
<para>
-Before MySQL 5.1.12,
- privileges also are assigned at the global level if you use
- <literal>ON *</literal> syntax and you have
- <emphasis>not</emphasis> selected a default database.
-As of 5.1.12,
- <literal>ON *</literal> requires a default database and produces an
-error is there is none.
+ Before MySQL 5.1.12, privileges also are assigned at the global
+ level if you use <literal>ON *</literal> syntax and you have
+ <emphasis>not</emphasis> selected a default database. As of
+ 5.1.12, <literal>ON *</literal> requires a default database and
+ produces an error is there is none.
</para>
<para>
@@ -621,10 +619,9 @@
</programlisting>
<para>
- Privileges also are assigned at the database level (for the default
-database) if you use
- <literal>ON *</literal> syntax and you have selected a default
- database.
+ Privileges also are assigned at the database level (for the
+ default database) if you use <literal>ON *</literal> syntax and
+ you have selected a default database.
</para>
<para>
@@ -3341,7 +3338,9 @@
</para>
<para>
- If you need to load plugins for a single server startup when the
+ For options that control individual plugin loading at server
+ startup, see <xref linkend="server-plugin-options"/>. If you
+ need to load plugins for a single server startup when the
<option role="mysqld">--skip-grant-tables</option> option is
given (which tells the server not to read system tables), use
the <option role="mysqld">--plugin-load</option> option. See
Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2009-06-08 16:33:48 UTC (rev 15247)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2009-06-08 18:24:19 UTC (rev 15248)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 868 bytes
@@ -3399,7 +3399,9 @@
</para>
<para>
- If you need to load plugins for a single server startup when the
+ For options that control individual plugin loading at server
+ startup, see <xref linkend="server-plugin-options"/>. If you
+ need to load plugins for a single server startup when the
<option role="mysqld">--skip-grant-tables</option> option is
given (which tells the server not to read system tables), use
the <option role="mysqld">--plugin-load</option> option. See
Modified: trunk/refman-5.4/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-server-administration.xml 2009-06-08 16:33:48 UTC (rev 15247)
+++ trunk/refman-5.4/sql-syntax-server-administration.xml 2009-06-08 18:24:19 UTC (rev 15248)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1302 bytes
@@ -607,10 +607,9 @@
</programlisting>
<para>
- Privileges also are assigned at the database level (for the default
-database) if you use
- <literal>ON *</literal> syntax and you have selected a default
- database.
+ Privileges also are assigned at the database level (for the
+ default database) if you use <literal>ON *</literal> syntax and
+ you have selected a default database.
</para>
<para>
@@ -3287,7 +3286,9 @@
</para>
<para>
- If you need to load plugins for a single server startup when the
+ For options that control individual plugin loading at server
+ startup, see <xref linkend="server-plugin-options"/>. If you
+ need to load plugins for a single server startup when the
<option role="mysqld">--skip-grant-tables</option> option is
given (which tells the server not to read system tables), use
the <option role="mysqld">--plugin-load</option> option. See
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2009-06-08 16:33:48 UTC (rev 15247)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2009-06-08 18:24:19 UTC (rev 15248)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1302 bytes
@@ -614,10 +614,9 @@
</programlisting>
<para>
- Privileges also are assigned at the database level (for the default
-database) if you use
- <literal>ON *</literal> syntax and you have selected a default
- database.
+ Privileges also are assigned at the database level (for the
+ default database) if you use <literal>ON *</literal> syntax and
+ you have selected a default database.
</para>
<para>
@@ -3590,7 +3589,9 @@
</para>
<para>
- If you need to load plugins for a single server startup when the
+ For options that control individual plugin loading at server
+ startup, see <xref linkend="server-plugin-options"/>. If you
+ need to load plugins for a single server startup when the
<option role="mysqld">--skip-grant-tables</option> option is
given (which tells the server not to read system tables), use
the <option role="mysqld">--plugin-load</option> option. See
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r15248 - in trunk: . refman-5.1 refman-5.1-maria refman-5.4 refman-6.0 | paul.dubois | 8 Jun |
