List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 22 2008 8:04pm
Subject:svn commit - mysqldoc@docsrva: r12616 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-6.0 refman-common
View as plain text  
Author: paul
Date: 2008-11-22 21:04:01 +0100 (Sat, 22 Nov 2008)
New Revision: 12616

Log:
 r36046@frost:  paul | 2008-11-22 14:02:20 -0500
 Add auto-link markup for auto_increment_{increment,offset} variables


Modified:
   trunk/dynamic-docs/changelog/connector-j.xml
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/refman-4.1/mysql-cluster-limitations.xml
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/mysql-cluster-limitations.xml
   trunk/refman-5.0/replication-options-core.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/faqs.xml
   trunk/refman-5.1/mysql-cluster-limitations.xml
   trunk/refman-5.1/mysql-cluster-replication.xml
   trunk/refman-5.1/tutorial.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/faqs.xml
   trunk/refman-6.0/tutorial.xml
   trunk/refman-common/ha-topology.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36045
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36046
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596


Modified: trunk/dynamic-docs/changelog/connector-j.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-j.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/dynamic-docs/changelog/connector-j.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 539 bytes

@@ -179,7 +179,7 @@
 
       <para>
         Connector/J ignored the value of the MySQL Server variable
-        <literal>auto_increment_increment</literal>.
+        <literal role="sysvar">auto_increment_increment</literal>.
       </para>
 
     </message>


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 880 bytes

@@ -8516,8 +8516,8 @@
 
       <para>
         <command>mysqlbinlog</command> did not output the values of
-        <literal>auto_increment_increment</literal> and
-        <literal>auto_increment_offset</literal> when both were equal to
+        <literal role="sysvar">auto_increment_increment</literal> and
+        <literal role="sysvar">auto_increment_offset</literal> when both were equal to
         their default values (for both of these variables, the default
         is 1). This meant that a binary log recorded by a client using
         the defaults for both variables and then replayed on another


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 6, Lines Added: 11, Lines Deleted: 11; 2899 bytes

@@ -25191,7 +25191,7 @@
     <message>
 
       <para>
-        If the <literal>auto_increment_offset</literal> setting causes
+        If the <literal role="sysvar">auto_increment_offset</literal> setting causes
         MySQL to generate a value larger than the column's maximum
         possible value, the <literal role="stmt">INSERT</literal>
         statement is accepted in strict SQL mode, whereas but should

@@ -26522,8 +26522,8 @@
 
       <para>
         Two new server system variables were introduced.
-        <literal>auto_increment_increment</literal> and
-        <literal>auto_increment_offset</literal> can be set locally or
+        <literal role="sysvar">auto_increment_increment</literal> and
+        <literal role="sysvar">auto_increment_offset</literal> can be set locally or
         globally, and are intended for use in controlling the behavior
         of <literal>AUTO_INCREMENT</literal> columns in master-to-master
         replication. Note that these variables are not intended to take

@@ -35569,7 +35569,7 @@
     <message>
 
       <para>
-        With the <literal>auto_increment_increment</literal> system
+        With the <literal role="sysvar">auto_increment_increment</literal> system
         variable set larger than 1, if the next generated
         <literal>AUTO_INCREMENT</literal> value would be larger than the
         column's maximum value, the value would be clipped down to that

@@ -46460,8 +46460,8 @@
     <message>
 
       <para>
-        <literal>auto_increment_increment</literal> and
-        <literal>auto_increment_offset</literal> are now supported for
+        <literal role="sysvar">auto_increment_increment</literal> and
+        <literal role="sysvar">auto_increment_offset</literal> are now supported for
         <literal>NDB</literal> tables.
       </para>
 

@@ -93134,8 +93134,8 @@
   <logentry entrytype="feature">
 
     <tags>
-      <manual type="auto-increment-offset"/>
-      <manual type="auto-increment-increment"/>
+      <manual type="auto_increment_offset"/>
+      <manual type="auto_increment_increment"/>
     </tags>
 
     <versions>

@@ -93145,9 +93145,9 @@
     <message>
 
       <para>
-        New <option>--auto-increment-increment</option> and
-        <option>--auto-increment-offset</option> startup options. These
-        allow you to set up a server to generate auto-increment values
+        New <literal role="sysvar">auto_increment_increment</literal> and
+        <literal role="sysvar">auto_increment_offset</literal> system variables. These
+        enable you to set up a server to generate auto-increment values
         that don't conflict with another server.
       </para>
 


Modified: trunk/refman-4.1/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-limitations.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-4.1/mysql-cluster-limitations.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1053 bytes

@@ -250,12 +250,12 @@
         <listitem>
           <formalpara>
 
-            <title><literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal></title>
+            <title><literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal></title>
 
             <para>
-              The <literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal> server system
+              The <literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal> server system
               variables are not supported for Cluster replication.
             </para>
 


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.0/faqs.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1155 bytes

@@ -132,11 +132,11 @@
             No. However, MySQL has an <literal>AUTO_INCREMENT</literal>
             system, which in MySQL &current-series; can also handle
             inserts in a multi-master replication setup. With the
-            <option>--auto-increment-increment</option> and
-            <option>--auto-increment-offset</option> startup options,
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> system variables,
             you can set each server to generate auto-increment values
             that don't conflict with other servers. The
-            <option>--auto-increment-increment</option> value should be
+            <literal role="sysvar">auto_increment_increment</literal> value should be
             greater than the number of servers, and each server should
             have a unique offset.
           </para>


Modified: trunk/refman-5.0/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-limitations.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.0/mysql-cluster-limitations.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1081 bytes

@@ -1537,12 +1537,12 @@
       <listitem>
         <formalpara>
 
-          <title><literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal></title>
+          <title><literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal></title>
 
           <para>
-            The <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> server system
+            The <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> server system
             variables are supported for <literal>NDBCLUSTER</literal>
             tables beginning with MySQL 5.0.46.
           </para>


Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.0/replication-options-core.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 9, Lines Added: 19, Lines Deleted: 19; 5630 bytes

@@ -113,14 +113,14 @@
             <secondary>auto_increment_increment</secondary>
           </indexterm>
 
-          <literal>auto_increment_increment</literal>
+          <literal role="sysvar">auto_increment_increment</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.0:mysqld:auto-increment-increment"/>
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:auto_increment_increment"/>
 
         <para>
-          <literal>auto_increment_increment</literal> and
-          <literal>auto_increment_offset</literal> are intended for use
+          <literal role="sysvar">auto_increment_increment</literal> and
+          <literal role="sysvar">auto_increment_offset</literal> are intended for use
           with master-to-master replication, and can be used to control
           the operation of <literal>AUTO_INCREMENT</literal> columns.
           Both variables have global and session values, and each can

@@ -130,8 +130,8 @@
           of either of these two variables to an integer greater than
           65,535 or less than 0 causes its value to be set to 65,535
           instead. Attempting to set the value of
-          <literal>auto_increment_increment</literal> or
-          <literal>auto_increment_offset</literal> to a non-integer
+          <literal role="sysvar">auto_increment_increment</literal> or
+          <literal role="sysvar">auto_increment_offset</literal> to a non-integer
           value gives rise to an error, and the actual value of the
           variable remains unchanged.
         </para>

@@ -145,7 +145,7 @@
 
           <listitem>
             <para>
-              <literal>auto_increment_increment</literal> controls the
+              <literal role="sysvar">auto_increment_increment</literal> controls the
               interval between successive column values. For example:
             </para>
 

@@ -200,12 +200,12 @@
 
           <listitem>
             <para>
-              <literal>auto_increment_offset</literal> determines the
+              <literal role="sysvar">auto_increment_offset</literal> determines the
               starting point for the <literal>AUTO_INCREMENT</literal>
               column value. Consider the following, assuming that these
               statements are executed during the same session as the
               example given in the description for
-              <literal>auto_increment_increment</literal>:
+              <literal role="sysvar">auto_increment_increment</literal>:
             </para>
 
 <programlisting>

@@ -242,10 +242,10 @@
 </programlisting>
 
             <para>
-              If the value of <literal>auto_increment_offset</literal>
+              If the value of <literal role="sysvar">auto_increment_offset</literal>
               is greater than that of
-              <literal>auto_increment_increment</literal>, the value of
-              <literal>auto_increment_offset</literal> is ignored.
+              <literal role="sysvar">auto_increment_increment</literal>, the value of
+              <literal role="sysvar">auto_increment_offset</literal> is ignored.
             </para>
           </listitem>
 

@@ -317,8 +317,8 @@
 
         <para>
           The values shown for
-          <literal>auto_increment_increment</literal> and
-          <literal>auto_increment_offset</literal> generate the series 5
+          <literal role="sysvar">auto_increment_increment</literal> and
+          <literal role="sysvar">auto_increment_offset</literal> generate the series 5
           + <replaceable>N</replaceable> &times; 10, that is, [5, 15,
           25, 35, 45, ...]. The greatest value present in the
           <literal>col</literal> column prior to the

@@ -347,13 +347,13 @@
         </para>
 
         <para>
-          The <literal>auto_increment_increment</literal> variable was
+          The <literal role="sysvar">auto_increment_increment</literal> variable was
           added in MySQL 5.0.2. Its default value is 1. See
           <xref linkend="replication-features-auto-increment"/>.
         </para>
 
         <para>
-          <literal>auto_increment_increment</literal> is supported for
+          <literal role="sysvar">auto_increment_increment</literal> is supported for
           use with <literal>NDB</literal> tables beginning with MySQL
           5.0.46. Previously, setting it when using MySQL Cluster tables
           produced unpredictable results.

@@ -371,7 +371,7 @@
             <secondary>auto_increment_offset</secondary>
           </indexterm>
 
-          <literal>auto_increment_offset</literal>
+          <literal role="sysvar">auto_increment_offset</literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="5.0:mysqld:auto_increment_offset"/>

@@ -379,11 +379,11 @@
         <para>
           This variable was introduced in MySQL 5.0.2. Its default value
           is 1. For particulars, see the description for
-          <literal>auto_increment_increment</literal>.
+          <literal role="sysvar">auto_increment_increment</literal>.
         </para>
 
         <para>
-          <literal>auto_increment_offset</literal> is supported for use
+          <literal role="sysvar">auto_increment_offset</literal> is supported for use
           with <literal>NDB</literal> tables beginning with MySQL
           5.0.46. Previously, setting it when using MySQL Cluster tables
           produced unpredictable results.


Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.0/tutorial.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 789 bytes

@@ -3932,8 +3932,8 @@
             <para>
               Server-system variables related to
               <literal>AUTO_INCREMENT</literal>
-              (<literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal>) that can be used
+              (<literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal>) that can be used
               for replication:
               <xref linkend="server-system-variables"/>.
             </para>


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.1/dba-core.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 9, Lines Added: 18, Lines Deleted: 18; 5723 bytes

@@ -3626,14 +3626,14 @@
               <secondary>auto_increment_increment</secondary>
             </indexterm>
 
-            <literal>auto_increment_increment</literal>
+            <literal role="sysvar">auto_increment_increment</literal>
           </para>
 
           <para condition="dynamic:optvar:item" role="5.1:mysqld:auto_increment_increment"/>
 
           <para>
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> are intended for
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> are intended for
             use with master-to-master replication, and can be used to
             control the operation of <literal>AUTO_INCREMENT</literal>
             columns. Both variables have global and session values, and

@@ -3643,15 +3643,15 @@
             Attempting to set the value of either of these two variables
             to an integer greater than 65,535 or less than 0 causes its
             value to be set to 65,535 instead. Attempting to set the
-            value of <literal>auto_increment_increment</literal> or
-            <literal>auto_increment_offset</literal> to a non-integer
+            value of <literal role="sysvar">auto_increment_increment</literal> or
+            <literal role="sysvar">auto_increment_offset</literal> to a non-integer
             value gives rise to an error, and the actual value of the
             variable remains unchanged.
           </para>
 
           <note>
             <para>
-              <literal>auto_increment_increment</literal> is supported
+              <literal role="sysvar">auto_increment_increment</literal> is supported
               for use with <literal>NDB</literal> tables beginning with
               MySQL 5.1.20, MySQL Cluster NDB 6.2.5, and MySQL Cluster
               NDB 6.3.2. Previously, setting it when using MySQL Cluster

@@ -3669,7 +3669,7 @@
 
             <listitem>
               <para>
-                <literal>auto_increment_increment</literal> controls the
+                <literal role="sysvar">auto_increment_increment</literal> controls the
                 interval between successive column values. For example:
               </para>
 

@@ -3724,12 +3724,12 @@
 
             <listitem>
               <para>
-                <literal>auto_increment_offset</literal> determines the
+                <literal role="sysvar">auto_increment_offset</literal> determines the
                 starting point for the <literal>AUTO_INCREMENT</literal>
                 column value. Consider the following, assuming that
                 these statements are executed during the same session as
                 the example given in the description for
-                <literal>auto_increment_increment</literal>:
+                <literal role="sysvar">auto_increment_increment</literal>:
               </para>
 
 <programlisting>

@@ -3766,10 +3766,10 @@
 </programlisting>
 
               <para>
-                If the value of <literal>auto_increment_offset</literal>
+                If the value of <literal role="sysvar">auto_increment_offset</literal>
                 is greater than that of
-                <literal>auto_increment_increment</literal>, the value
-                of <literal>auto_increment_offset</literal> is ignored.
+                <literal role="sysvar">auto_increment_increment</literal>, the value
+                of <literal role="sysvar">auto_increment_offset</literal> is ignored.
               </para>
             </listitem>
 

@@ -3842,8 +3842,8 @@
 
           <para>
             The values shown for
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> generate the series
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> generate the series
             5 + <replaceable>N</replaceable> &times; 10, that is, [5,
             15, 25, 35, 45, ...]. The greatest value present in the
             <literal>col</literal> column prior to the

@@ -3874,7 +3874,7 @@
 
           <para>
             The default value of
-            <literal>auto_increment_increment</literal> is 1. See
+            <literal role="sysvar">auto_increment_increment</literal> is 1. See
             <xref linkend="replication-features-auto-increment"/>.
           </para>
         </listitem>

@@ -3890,7 +3890,7 @@
               <secondary>auto_increment_offset</secondary>
             </indexterm>
 
-            <literal>auto_increment_offset</literal>
+            <literal role="sysvar">auto_increment_offset</literal>
           </para>
 
           <para condition="dynamic:optvar:item" role="5.1:mysqld:auto_increment_offset"/>

@@ -3898,12 +3898,12 @@
           <para>
             This variable has a default value of 1. For particulars, see
             the description for
-            <literal>auto_increment_increment</literal>.
+            <literal role="sysvar">auto_increment_increment</literal>.
           </para>
 
           <note>
             <para>
-              <literal>auto_increment_offset</literal> is supported for
+              <literal role="sysvar">auto_increment_offset</literal> is supported for
               use with <literal>NDB</literal> tables beginning with
               MySQL 5.1.20, MySQL Cluster NDB 6.2.5, and MySQL Cluster
               NDB 6.3.2. Previously, setting it when using MySQL Cluster


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.1/faqs.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1155 bytes

@@ -132,11 +132,11 @@
             No. However, MySQL has an <literal>AUTO_INCREMENT</literal>
             system, which in MySQL &current-series; can also handle
             inserts in a multi-master replication setup. With the
-            <option>--auto-increment-increment</option> and
-            <option>--auto-increment-offset</option> startup options,
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> system variables,
             you can set each server to generate auto-increment values
             that don't conflict with other servers. The
-            <option>--auto-increment-increment</option> value should be
+            <literal role="sysvar">auto_increment_increment</literal> value should be
             greater than the number of servers, and each server should
             have a unique offset.
           </para>


Modified: trunk/refman-5.1/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-limitations.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.1/mysql-cluster-limitations.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1136 bytes

@@ -1658,12 +1658,12 @@
         <listitem>
           <formalpara>
 
-            <title><literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal></title>
+            <title><literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal></title>
 
             <para>
-              The <literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal> server system
+              The <literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal> server system
               variables are supported for Cluster replication beginning
               with MySQL 5.1.20, MySQL Cluster NDB 6.2.5, and MySQL
               Cluster 6.3.2.


Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.1/mysql-cluster-replication.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1304 bytes

@@ -612,8 +612,8 @@
       <listitem>
         <formalpara>
 
-          <title><literal>auto_increment_offset</literal> and
-            <literal>auto_increment_increment</literal> variables</title>
+          <title><literal role="sysvar">auto_increment_offset</literal> and
+            <literal role="sysvar">auto_increment_increment</literal> variables</title>
 
           <indexterm>
             <primary>MySQL Cluster replication</primary>

@@ -621,8 +621,8 @@
           </indexterm>
 
           <para>
-            The use of the <literal>auto_increment_offset</literal> and
-            <literal>auto_increment_increment</literal> server system
+            The use of the <literal role="sysvar">auto_increment_offset</literal> and
+            <literal role="sysvar">auto_increment_increment</literal> server system
             variables is supported beginning with MySQL 5.1.20.
             Previously, these produced unpredictable results when used
             with <literal>NDB</literal> tables or MySQL Cluster


Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-5.1/tutorial.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 789 bytes

@@ -3919,8 +3919,8 @@
             <para>
               Server-system variables related to
               <literal>AUTO_INCREMENT</literal>
-              (<literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal>) that can be used
+              (<literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal>) that can be used
               for replication:
               <xref linkend="server-system-variables"/>.
             </para>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-6.0/dba-core.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 9, Lines Added: 16, Lines Deleted: 16; 4924 bytes

@@ -3684,14 +3684,14 @@
               <secondary>auto_increment_increment</secondary>
             </indexterm>
 
-            <literal>auto_increment_increment</literal>
+            <literal role="sysvar">auto_increment_increment</literal>
           </para>
 
           <para condition="dynamic:optvar:item" role="6.0:mysqld:auto_increment_increment"/>
 
           <para>
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> are intended for
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> are intended for
             use with master-to-master replication, and can be used to
             control the operation of <literal>AUTO_INCREMENT</literal>
             columns. Both variables have global and session values, and

@@ -3701,8 +3701,8 @@
             Attempting to set the value of either of these two variables
             to an integer greater than 65,535 or less than 0 causes its
             value to be set to 65,535 instead. Attempting to set the
-            value of <literal>auto_increment_increment</literal> or
-            <literal>auto_increment_offset</literal> to a non-integer
+            value of <literal role="sysvar">auto_increment_increment</literal> or
+            <literal role="sysvar">auto_increment_offset</literal> to a non-integer
             value gives rise to an error, and the actual value of the
             variable remains unchanged.
           </para>

@@ -3716,7 +3716,7 @@
 
             <listitem>
               <para>
-                <literal>auto_increment_increment</literal> controls the
+                <literal role="sysvar">auto_increment_increment</literal> controls the
                 interval between successive column values. For example:
               </para>
 

@@ -3771,12 +3771,12 @@
 
             <listitem>
               <para>
-                <literal>auto_increment_offset</literal> determines the
+                <literal role="sysvar">auto_increment_offset</literal> determines the
                 starting point for the <literal>AUTO_INCREMENT</literal>
                 column value. Consider the following, assuming that
                 these statements are executed during the same session as
                 the example given in the description for
-                <literal>auto_increment_increment</literal>:
+                <literal role="sysvar">auto_increment_increment</literal>:
               </para>
 
 <programlisting>

@@ -3813,10 +3813,10 @@
 </programlisting>
 
               <para>
-                If the value of <literal>auto_increment_offset</literal>
+                If the value of <literal role="sysvar">auto_increment_offset</literal>
                 is greater than that of
-                <literal>auto_increment_increment</literal>, the value
-                of <literal>auto_increment_offset</literal> is ignored.
+                <literal role="sysvar">auto_increment_increment</literal>, the value
+                of <literal role="sysvar">auto_increment_offset</literal> is ignored.
               </para>
             </listitem>
 

@@ -3889,8 +3889,8 @@
 
           <para>
             The values shown for
-            <literal>auto_increment_increment</literal> and
-            <literal>auto_increment_offset</literal> generate the series
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> generate the series
             5 + <replaceable>N</replaceable> &times; 10, that is, [5,
             15, 25, 35, 45, ...]. The greatest value present in the
             <literal>col</literal> column prior to the

@@ -3921,7 +3921,7 @@
 
           <para>
             The default value of
-            <literal>auto_increment_increment</literal> is 1. See
+            <literal role="sysvar">auto_increment_increment</literal> is 1. See
             <xref linkend="replication-features-auto-increment"/>.
           </para>
         </listitem>

@@ -3937,7 +3937,7 @@
               <secondary>auto_increment_offset</secondary>
             </indexterm>
 
-            <literal>auto_increment_offset</literal>
+            <literal role="sysvar">auto_increment_offset</literal>
           </para>
 
           <para condition="dynamic:optvar:item" role="6.0:mysqld:auto_increment_offset"/>

@@ -3945,7 +3945,7 @@
           <para>
             This variable has a default value of 1. For particulars, see
             the description for
-            <literal>auto_increment_increment</literal>.
+            <literal role="sysvar">auto_increment_increment</literal>.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-6.0/faqs.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1155 bytes

@@ -132,11 +132,11 @@
             No. However, MySQL has an <literal>AUTO_INCREMENT</literal>
             system, which in MySQL &current-series; can also handle
             inserts in a multi-master replication setup. With the
-            <option>--auto-increment-increment</option> and
-            <option>--auto-increment-offset</option> startup options,
+            <literal role="sysvar">auto_increment_increment</literal> and
+            <literal role="sysvar">auto_increment_offset</literal> system variables,
             you can set each server to generate auto-increment values
             that don't conflict with other servers. The
-            <option>--auto-increment-increment</option> value should be
+            <literal role="sysvar">auto_increment_increment</literal> value should be
             greater than the number of servers, and each server should
             have a unique offset.
           </para>


Modified: trunk/refman-6.0/tutorial.xml
===================================================================
--- trunk/refman-6.0/tutorial.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-6.0/tutorial.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 789 bytes

@@ -3919,8 +3919,8 @@
             <para>
               Server-system variables related to
               <literal>AUTO_INCREMENT</literal>
-              (<literal>auto_increment_increment</literal> and
-              <literal>auto_increment_offset</literal>) that can be used
+              (<literal role="sysvar">auto_increment_increment</literal> and
+              <literal role="sysvar">auto_increment_offset</literal>) that can be used
               for replication:
               <xref linkend="server-system-variables"/>.
             </para>


Modified: trunk/refman-common/ha-topology.xml
===================================================================
--- trunk/refman-common/ha-topology.xml	2008-11-22 20:03:52 UTC (rev 12615)
+++ trunk/refman-common/ha-topology.xml	2008-11-22 20:04:01 UTC (rev 12616)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2582 bytes

@@ -105,8 +105,8 @@
         </para>
 
         <para>
-          The <literal>auto_increment_increment</literal> and
-          <literal>auto_increment_offset</literal> system variables help
+          The <literal role="sysvar">auto_increment_increment</literal> and
+          <literal role="sysvar">auto_increment_offset</literal> system variables help
           to accommodate multiple-master replication with
           <literal>AUTO_INCREMENT</literal> columns. Each of these
           variables has a default and minimum value of 1, and a maximum

@@ -122,7 +122,7 @@
 
           <listitem>
             <para>
-              <literal>auto_increment_increment</literal> controls the
+              <literal role="sysvar">auto_increment_increment</literal> controls the
               increment between successive
               <literal>AUTO_INCREMENT</literal> values.
             </para>

@@ -130,7 +130,7 @@
 
           <listitem>
             <para>
-              <literal>auto_increment_offset</literal> determines the
+              <literal role="sysvar">auto_increment_offset</literal> determines the
               starting point for <literal>AUTO_INCREMENT</literal>
               column values.
             </para>

@@ -151,7 +151,7 @@
 
           <listitem>
             <para>
-              Set <literal>auto_increment_increment</literal> to
+              Set <literal role="sysvar">auto_increment_increment</literal> to
               <replaceable>N</replaceable> on each master.
             </para>
           </listitem>

@@ -159,7 +159,7 @@
           <listitem>
             <para>
               Set each of the <replaceable>N</replaceable> masters to
-              have a different <literal>auto_increment_offset</literal>,
+              have a different <literal role="sysvar">auto_increment_offset</literal>,
               using the values 1, 2, &hellip;,
               <replaceable>N</replaceable>.
             </para>

@@ -169,8 +169,8 @@
 
         <para>
           For additional information about
-          <literal>auto_increment_increment</literal> and
-          <literal>auto_increment_offset</literal>, see
+          <literal role="sysvar">auto_increment_increment</literal> and
+          <literal role="sysvar">auto_increment_offset</literal>, see
           <xref linkend="server-system-variables"/>.
         </para>
 


Thread
svn commit - mysqldoc@docsrva: r12616 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-6.0 refman-commonpaul.dubois22 Nov