List:Commits« Previous MessageNext Message »
From:paul.dubois Date:June 21 2011 6:02pm
Subject:svn commit - mysqldoc@oter02: r26575 - in trunk: . refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: pd221994
Date: 2011-06-21 20:02:25 +0200 (Tue, 21 Jun 2011)
New Revision: 26575

Log:
 r49173@dhcp-adc-twvpn-1-vpnpool-10-154-30-168:  paul | 2011-06-21 12:57:29 -0500
 Update references to old IDs from previous change to new ID
 Add new lines to node mapping file


Modified:
   svk:merge
   trunk/refman-5.1/dba-mysqld-server-core.xml
   trunk/refman-5.1/dba-privilege-system.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/installing-updowngrade.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-5.5/dba-privilege-system.xml
   trunk/refman-5.5/extending-mysql.xml
   trunk/refman-5.5/information-schema.xml
   trunk/refman-5.5/renamed-nodes.txt
   trunk/refman-5.5/se-innodb-core.xml
   trunk/refman-5.5/sql-syntax-server-administration.xml
   trunk/refman-5.6/dba-mysqld-server-core.xml
   trunk/refman-5.6/dba-privilege-system.xml
   trunk/refman-5.6/extending-mysql.xml
   trunk/refman-5.6/information-schema.xml
   trunk/refman-5.6/renamed-nodes.txt
   trunk/refman-5.6/se-innodb-core.xml
   trunk/refman-5.6/sql-syntax-server-administration.xml
   trunk/refman-6.0/dba-mysqld-server-core.xml
   trunk/refman-6.0/dba-privilege-system.xml
   trunk/refman-6.0/extending-mysql.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 798 bytes

@@ -188,7 +188,7 @@
       <listitem>
         <para>
           Options for loading plugins such as pluggable storage engines:
-          See <xref linkend="server-plugin-options"/>.
+          See <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 

@@ -2397,7 +2397,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="plugin-installing-uninstalling"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>


Modified: trunk/refman-5.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.1/dba-privilege-system.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/dba-privilege-system.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -1003,8 +1003,8 @@
       <listitem>
         <para>
           <literal>plugin</literal>: Contains information about server
-          plugins: See <xref linkend="plugin-installing-uninstalling"/>,
-          and <xref linkend= "plugin-api"/>.
+          plugins: See <xref linkend="server-plugin-loading"/>, and
+          <xref linkend= "plugin-api"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/extending-mysql.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 1628 bytes

@@ -324,7 +324,7 @@
       be installed for a single server invocation with the
       <option>--plugin-load</option> option. Plugins installed this way
       are not recorded in the <literal>plugin</literal> table. See
-      <xref linkend="plugin-installing-uninstalling"/>.
+      <xref linkend="server-plugin-loading"/>.
     </para>
 
     <bridgehead>

@@ -535,7 +535,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -1003,7 +1003,7 @@
           <listitem>
             <para>
               Register the plugin with the server. For more information,
-              see <xref linkend="registering-plugins"/>.
+              see <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3046,7 +3046,7 @@
 
             <para>
               For additional information about plugin loading, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3305,7 +3305,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>


Modified: trunk/refman-5.1/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.1/installing-updowngrade.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/installing-updowngrade.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 584 bytes

@@ -1031,7 +1031,7 @@
             or
             <option>--<replaceable>plugin_name</replaceable>=ON</option>,
             respectively. For details, see
-            <xref linkend="server-plugin-options"/>.
+            <xref linkend="server-plugin-loading"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/renamed-nodes.txt	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 0; 1442 bytes

@@ -161,6 +161,7 @@
 plugin-descriptors plugin-data-structures 2012-04-14
 plugin-full-text-plugins full-text-plugins 2011-03-27
 plugin-general-data-structures plugin-data-structures 2012-04-13
+plugin-installing-uninstalling server-plugin-loading 2012-06-21
 plugin-type-specific-data-structures plugin-data-structures 2012-04-13
 plugin-writing writing-plugins 2012-04-12
 post-installation postinstallation 2011-12-03

@@ -168,6 +169,7 @@
 query-speed select-optimization 2011-07-14
 quick-install installing-source-distribution 2011-11-28
 quick-standard-installation binary-installation 2010-10-01
+registering-plugins server-plugin-loading 2012-06-21
 repair myisam-repair 2010-11-05
 replication-features-mastercrash replication-features-shutdowns 2011-05-05
 replication-features-mastershutdown replication-features-shutdowns 2011-05-05

@@ -175,6 +177,7 @@
 replication-rules-charts replication-rules 2010-07-07
 roadmap development-history 2011-02-11
 rts-threads porting 2011-10-20
+server-plugin-options server-plugin-loading 2012-06-21
 server-session-variables server-system-variables 2011-04-28
 solaris solaris-installation-source 2011-07-01
 source-notes-linux linux-installation 2010-10-01


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/se-innodb-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 648 bytes

@@ -1557,7 +1557,7 @@
           option has a tristate format, with possible values of
           <literal>OFF</literal>, <literal>ON</literal>, or
           <literal>FORCE</literal>. Before MySQL 5.1.36, this is a
-          boolean option. See <xref linkend="server-plugin-options"/>.
+          boolean option. See <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1227 bytes

@@ -3596,7 +3596,7 @@
 
       <para>
         For options that control individual plugin loading at server
-        startup, see <xref linkend="server-plugin-options"/>. If you
+        startup, see <xref linkend="server-plugin-loading"/>. 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

@@ -3611,7 +3611,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -3730,7 +3730,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
     </section>


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 801 bytes

@@ -183,7 +183,7 @@
       <listitem>
         <para>
           Options for loading plugins such as pluggable storage engines:
-          See <xref linkend="server-plugin-options"/>.
+          See <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 

@@ -2418,7 +2418,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="plugin-installing-uninstalling"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.5/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.5/dba-privilege-system.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/dba-privilege-system.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -1024,8 +1024,8 @@
       <listitem>
         <para>
           <literal>plugin</literal>: Contains information about server
-          plugins: See <xref linkend="plugin-installing-uninstalling"/>,
-          and <xref linkend= "plugin-api"/>.
+          plugins: See <xref linkend="server-plugin-loading"/>, and
+          <xref linkend= "plugin-api"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.5/extending-mysql.xml
===================================================================
--- trunk/refman-5.5/extending-mysql.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/extending-mysql.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 2208 bytes

@@ -321,7 +321,7 @@
       Plugins can also be installed for a single server invocation with
       the <option>--plugin-load</option> option. Plugins installed this
       way are not recorded in the <literal>plugin</literal> table. See
-      <xref linkend="plugin-installing-uninstalling"/>.
+      <xref linkend="server-plugin-loading"/>.
     </para>
 
     <para>

@@ -558,7 +558,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -1259,7 +1259,7 @@
             <para>
               For server plugins, register the plugin with the server.
               For more information, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3617,7 +3617,7 @@
 
             <para>
               For additional information about plugin loading, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3876,7 +3876,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -4600,7 +4600,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -5091,7 +5091,7 @@
           <para>
             For additional information about loading and using
             authentication plugins, see
-            <xref linkend="registering-plugins"/>, and
+            <xref linkend="server-plugin-loading"/>, and
             <xref linkend="pluggable-authentication"/>.
           </para>
 


Modified: trunk/refman-5.5/information-schema.xml
===================================================================
--- trunk/refman-5.5/information-schema.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/information-schema.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 673 bytes

@@ -3761,7 +3761,7 @@
           loaded. The value is <literal>OFF</literal>,
           <literal>ON</literal>, <literal>FORCE</literal>, or
           <literal>FORCE_PLUS_PERMANENT</literal>. See
-          <xref linkend="server-plugin-options"/>. This column was added
+          <xref linkend="server-plugin-loading"/>. This column was added
           in MySQL 5.5.7.
         </para>
       </listitem>


Modified: trunk/refman-5.5/renamed-nodes.txt
===================================================================
--- trunk/refman-5.5/renamed-nodes.txt	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/renamed-nodes.txt	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 4; 3149 bytes

@@ -30,9 +30,9 @@
 ansi-diff-views views 2011-05-18
 authentication-plugin-information obtaining-plugin-information 2012-04-18
 binary-notes-linux linux-installation 2011-10-23
+bsdi installing 2011-10-21
 bsdi3 installing 2011-10-21
 bsdi4 installing 2011-10-21
-bsdi installing 2011-10-21
 bsd-notes installing 2011-10-21
 c-api-datatypes c-api-data-structures 2011-06-10
 c-api-prepared-statement-datatypes c-api-prepared-statement-data-structures 2011-06-10

@@ -64,9 +64,9 @@
 installing-source-tree installing-development-tree 2011-11-28
 internationalization-localization globalization 2012-05-18
 link-errors c-api-linking-problems 2011-12-09
+linux linux-installation 2011-10-23
 linux-alpha linux-installation 2011-10-23
 linux-ia-64 linux-installation 2011-10-23
-linux linux-installation 2011-10-23
 linux-mips linux-installation 2011-10-23
 linux-os linux-installation 2011-10-23
 linux-post-install linux-installation 2011-10-23

@@ -78,9 +78,9 @@
 load-table-from-master introduction 2011-03-06
 lock-tables-notes lock-tables-restrictions 2011-12-20
 log-tables log-destinations 2011-09-21
+mac-os-x macosx-installation 2011-10-21
 mac-os-x-10-x macosx-installation 2011-10-21
 mac-os-x-installation macosx-installation 2011-10-21
-mac-os-x macosx-installation 2011-10-21
 mac-os-x-server macosx-installation 2011-10-21
 mem-introduction mysql-enterprise-monitor 2012-03-23
 mit-pthreads source-installation 2011-10-19

@@ -111,6 +111,7 @@
 plugin-descriptors plugin-data-structures 2012-04-14
 plugin-full-text-plugins full-text-plugins 2011-03-27
 plugin-general-data-structures plugin-data-structures 2012-04-13
+plugin-installing-uninstalling server-plugin-loading 2012-06-21
 plugin-service-api plugin-services 2011-03-24
 plugin-type-specific-data-structures plugin-data-structures 2012-04-13
 plugin-writing writing-plugins 2012-04-12

@@ -118,6 +119,7 @@
 query-speed select-optimization 2011-07-14
 quick-install installing-source-distribution 2011-11-28
 quick-standard-installation binary-installation 2011-10-21
+registering-plugins server-plugin-loading 2012-06-21
 replication-features-mastercrash replication-features-shutdowns 2011-05-05
 replication-features-mastershutdown replication-features-shutdowns 2011-05-05
 replication-features-slaveshutdown replication-features-shutdowns 2011-05-05

@@ -126,11 +128,12 @@
 sco-openserver installing 2011-10-21
 sco-unixware installing 2011-10-21
 selinux linux-installation 2011-10-23
+server-plugin-options server-plugin-loading 2012-06-21
 server-session-variables server-system-variables 2011-04-28
 sgi-irix installing 2011-10-21
+solaris solaris-installation 2011-10-22
 solaris-2-7 solaris-installation 2011-10-22
 solaris-installation-source solaris-installation 2011-11-16
-solaris solaris-installation 2011-10-22
 solaris-x86 solaris-installation 2011-10-22
 source-notes-linux linux-installation 2011-10-23
 storage-engine-compare-transactions storage-engines 2012-05-25


Modified: trunk/refman-5.5/se-innodb-core.xml
===================================================================
--- trunk/refman-5.5/se-innodb-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/se-innodb-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 2, Lines Added: 58, Lines Deleted: 60; 6927 bytes

@@ -1864,7 +1864,7 @@
           <literal>InnoDB</literal> support. This option has a tristate
           format, with possible values of <literal>OFF</literal>,
           <literal>ON</literal>, or <literal>FORCE</literal>. See
-          <xref linkend="server-plugin-options"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -2828,71 +2828,69 @@
 
         <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_io_capacity"/>
 
-          <para>
-            An upper limit on the I/O activity performed by the
-            <literal>InnoDB</literal> background tasks, such as flushing
-            pages from the <link linkend="glos_buffer_pool">buffer
-            pool</link> and merging data from the
-            <link linkend="glos_insert_buffer">insert buffer</link>. The
-            default value is 200. For busy systems capable of higher I/O
-            rates, you can set a higher value at server startup, to help
-            the server handle the background maintenance work associated
-            with a high rate of row changes. For systems with individual
-            5400 RPM or 7200 RPM drives, you might lower the value to
-            the former default of <literal>100</literal>.
-          </para>
+        <para>
+          An upper limit on the I/O activity performed by the
+          <literal>InnoDB</literal> background tasks, such as flushing
+          pages from the <link linkend="glos_buffer_pool">buffer
+          pool</link> and merging data from the
+          <link linkend="glos_insert_buffer">insert buffer</link>. The
+          default value is 200. For busy systems capable of higher I/O
+          rates, you can set a higher value at server startup, to help
+          the server handle the background maintenance work associated
+          with a high rate of row changes. For systems with individual
+          5400 RPM or 7200 RPM drives, you might lower the value to the
+          former default of <literal>100</literal>.
+        </para>
 
-          <para>
-            This parameter should be set to approximately the number of
-            I/O operations that the system can perform per second. The
-            Ideally, keep this setting as low as practical, but not so
-            low that these background activities fall behind. If the
-            value is too high, data is removed from the buffer pool and
-            insert buffer too quickly to provide significant benefit
-            from the caching.
-          </para>
+        <para>
+          This parameter should be set to approximately the number of
+          I/O operations that the system can perform per second. The
+          Ideally, keep this setting as low as practical, but not so low
+          that these background activities fall behind. If the value is
+          too high, data is removed from the buffer pool and insert
+          buffer too quickly to provide significant benefit from the
+          caching.
+        </para>
 
-          <para>
-            The value represents an estimated proportion of the I/O
-            operations per second (IOPS) available to older-generation
-            disk drives that could perform about 100 IOPS. The current
-            default of 200 reflects that modern storage devices are
-            capable of much higher I/O rates.
-          </para>
+        <para>
+          The value represents an estimated proportion of the I/O
+          operations per second (IOPS) available to older-generation
+          disk drives that could perform about 100 IOPS. The current
+          default of 200 reflects that modern storage devices are
+          capable of much higher I/O rates.
+        </para>
 
-          <para>
-            In general, you can increase the value as a function of the
-            number of drives used for
-            <literal role="se">InnoDB</literal> I/O, particularly fast
-            drives capable of high numbers of IOPS. For example, systems
-            that use multiple disks or solid-state disks for
-            <literal role="se">InnoDB</literal> are likely to benefit
-            from the ability to control this parameter.
-          </para>
+        <para>
+          In general, you can increase the value as a function of the
+          number of drives used for <literal role="se">InnoDB</literal>
+          I/O, particularly fast drives capable of high numbers of IOPS.
+          For example, systems that use multiple disks or solid-state
+          disks for <literal role="se">InnoDB</literal> are likely to
+          benefit from the ability to control this parameter.
+        </para>
 
-          <para>
-            Although you can specify a very high number, in practice
-            such large values cease to have any benefit; for example, a
-            value of one million would be considered very high.
-          </para>
+        <para>
+          Although you can specify a very high number, in practice such
+          large values cease to have any benefit; for example, a value
+          of one million would be considered very high.
+        </para>
 
-          <para>
-            You can set the <literal>innodb_io_capacity</literal> value
-            to any number 100 or greater, and the default value is
-            <literal>200</literal>. You can set the value of this
-            parameter in the MySQL option file
-            (<literal>my.cnf</literal> or <literal>my.ini</literal>) or
-            change it dynamically with the <literal>SET GLOBAL</literal>
-            command, which requires the <literal>SUPER</literal>
-            privilege.
-          </para>
+        <para>
+          You can set the <literal>innodb_io_capacity</literal> value to
+          any number 100 or greater, and the default value is
+          <literal>200</literal>. You can set the value of this
+          parameter in the MySQL option file (<literal>my.cnf</literal>
+          or <literal>my.ini</literal>) or change it dynamically with
+          the <literal>SET GLOBAL</literal> command, which requires the
+          <literal>SUPER</literal> privilege.
+        </para>
 
-          <para>
-            See <xref linkend="innodb-performance-thread_io_rate"/> for
-            more guidelines about this option. For general information
-            about InnoDB I/O performance, see
-            <xref linkend="optimizing-innodb-diskio"/>.
-          </para>
+        <para>
+          See <xref linkend="innodb-performance-thread_io_rate"/> for
+          more guidelines about this option. For general information
+          about InnoDB I/O performance, see
+          <xref linkend="optimizing-innodb-diskio"/>.
+        </para>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.5/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-server-administration.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.5/sql-syntax-server-administration.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1227 bytes

@@ -3463,7 +3463,7 @@
 
       <para>
         For options that control individual plugin loading at server
-        startup, see <xref linkend="server-plugin-options"/>. If you
+        startup, see <xref linkend="server-plugin-loading"/>. 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

@@ -3478,7 +3478,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -3597,7 +3597,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
     </section>


Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 801 bytes

@@ -183,7 +183,7 @@
       <listitem>
         <para>
           Options for loading plugins such as pluggable storage engines:
-          See <xref linkend="server-plugin-options"/>.
+          See <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 

@@ -2246,7 +2246,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="plugin-installing-uninstalling"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.6/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.6/dba-privilege-system.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/dba-privilege-system.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -1049,8 +1049,8 @@
       <listitem>
         <para>
           <literal>plugin</literal>: Contains information about server
-          plugins: See <xref linkend="plugin-installing-uninstalling"/>,
-          and <xref linkend= "plugin-api"/>.
+          plugins: See <xref linkend="server-plugin-loading"/>, and
+          <xref linkend= "plugin-api"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.6/extending-mysql.xml
===================================================================
--- trunk/refman-5.6/extending-mysql.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/extending-mysql.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 2208 bytes

@@ -321,7 +321,7 @@
       Plugins can also be installed for a single server invocation with
       the <option>--plugin-load</option> option. Plugins installed this
       way are not recorded in the <literal>plugin</literal> table. See
-      <xref linkend="plugin-installing-uninstalling"/>.
+      <xref linkend="server-plugin-loading"/>.
     </para>
 
     <para>

@@ -558,7 +558,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -1259,7 +1259,7 @@
             <para>
               For server plugins, register the plugin with the server.
               For more information, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3617,7 +3617,7 @@
 
             <para>
               For additional information about plugin loading, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3876,7 +3876,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -4594,7 +4594,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -5026,7 +5026,7 @@
           <para>
             For additional information about loading and using
             authentication plugins, see
-            <xref linkend="registering-plugins"/>, and
+            <xref linkend="server-plugin-loading"/>, and
             <xref linkend="pluggable-authentication"/>.
           </para>
 


Modified: trunk/refman-5.6/information-schema.xml
===================================================================
--- trunk/refman-5.6/information-schema.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/information-schema.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 604 bytes

@@ -3762,7 +3762,7 @@
           loaded. The value is <literal>OFF</literal>,
           <literal>ON</literal>, <literal>FORCE</literal>, or
           <literal>FORCE_PLUS_PERMANENT</literal>. See
-          <xref linkend="server-plugin-options"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-5.6/renamed-nodes.txt
===================================================================
--- trunk/refman-5.6/renamed-nodes.txt	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/renamed-nodes.txt	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 941 bytes

@@ -29,8 +29,11 @@
 performance-schema-post-filtering performance-schema-queries 2012-04-21
 plugin-descriptors plugin-data-structures 2012-04-14
 plugin-general-data-structures plugin-data-structures 2012-04-13
+plugin-installing-uninstalling server-plugin-loading 2012-06-21
 plugin-type-specific-data-structures plugin-data-structures 2012-04-13
 plugin-writing writing-plugins 2012-04-12
+registering-plugins server-plugin-loading 2012-06-21
+server-plugin-options server-plugin-loading 2012-06-21
 storage-engine-compare-transactions storage-engines 2012-05-25
 using-authentication-plugins pluggable-authentication 2012-04-18
 writing-plugin-descriptors plugin-data-structures 2012-04-14


Modified: trunk/refman-5.6/se-innodb-core.xml
===================================================================
--- trunk/refman-5.6/se-innodb-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/se-innodb-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 582 bytes

@@ -9935,7 +9935,7 @@
             tristate format, with possible values of
             <literal>OFF</literal>, <literal>ON</literal>, or
             <literal>FORCE</literal>. See
-            <xref linkend="server-plugin-options"/>.
+            <xref linkend="server-plugin-loading"/>.
           </para>
 
           <para>


Modified: trunk/refman-5.6/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-server-administration.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-5.6/sql-syntax-server-administration.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1227 bytes

@@ -3462,7 +3462,7 @@
 
       <para>
         For options that control individual plugin loading at server
-        startup, see <xref linkend="server-plugin-options"/>. If you
+        startup, see <xref linkend="server-plugin-loading"/>. 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

@@ -3477,7 +3477,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -3596,7 +3596,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
     </section>


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 801 bytes

@@ -183,7 +183,7 @@
       <listitem>
         <para>
           Options for loading plugins such as pluggable storage engines:
-          See <xref linkend="server-plugin-options"/>.
+          See <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 

@@ -2582,7 +2582,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="plugin-installing-uninstalling"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-6.0/dba-privilege-system.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-6.0/dba-privilege-system.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 666 bytes

@@ -1008,8 +1008,8 @@
       <listitem>
         <para>
           <literal>plugin</literal>: Contains information about server
-          plugins: See <xref linkend="plugin-installing-uninstalling"/>,
-          and <xref linkend= "plugin-api"/>.
+          plugins: See <xref linkend="server-plugin-loading"/>, and
+          <xref linkend= "plugin-api"/>.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/extending-mysql.xml
===================================================================
--- trunk/refman-6.0/extending-mysql.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-6.0/extending-mysql.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 1888 bytes

@@ -363,7 +363,7 @@
       Plugins can also be installed for a single server invocation with
       the <option>--plugin-load</option> option. Plugins installed this
       way are not recorded in the <literal>plugin</literal> table. See
-      <xref linkend="plugin-installing-uninstalling"/>.
+      <xref linkend="server-plugin-loading"/>.
     </para>
 
     <bridgehead>

@@ -586,7 +586,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -1177,7 +1177,7 @@
           <listitem>
             <para>
               Register the plugin with the server. For more information,
-              see <xref linkend="registering-plugins"/>.
+              see <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3219,7 +3219,7 @@
 
             <para>
               For additional information about plugin loading, see
-              <xref linkend="registering-plugins"/>.
+              <xref linkend="server-plugin-loading"/>.
             </para>
           </listitem>
 

@@ -3478,7 +3478,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="registering-plugins"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>

@@ -4052,7 +4052,7 @@
 
         <para>
           For additional information about plugin loading, see
-          <xref linkend="plugin-installing-uninstalling"/>.
+          <xref linkend="server-plugin-loading"/>.
         </para>
 
         <para>


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2011-06-21 18:02:15 UTC (rev 26574)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2011-06-21 18:02:25 UTC (rev 26575)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1227 bytes

@@ -3878,7 +3878,7 @@
 
       <para>
         For options that control individual plugin loading at server
-        startup, see <xref linkend="server-plugin-options"/>. If you
+        startup, see <xref linkend="server-plugin-loading"/>. 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

@@ -3893,7 +3893,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
       <para>

@@ -4012,7 +4012,7 @@
 
       <para>
         For additional information about plugin loading, see
-        <xref linkend="plugin-installing-uninstalling"/>.
+        <xref linkend="server-plugin-loading"/>.
       </para>
 
     </section>


Thread
svn commit - mysqldoc@oter02: r26575 - in trunk: . refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois22 Jun