List:Commits« Previous MessageNext Message »
From:jon.stephens Date:June 30 2011 3:23pm
Subject:svn commit - mysqldoc@oter02: r26653 - trunk/refman-5.6
View as plain text  
Author: js221926
Date: 2011-06-30 17:23:11 +0200 (Thu, 30 Jun 2011)
New Revision: 26653

Log:

De-gunking nested lists



Modified:
   trunk/refman-5.6/dba-log-files.xml
   trunk/refman-5.6/functions-core.xml
   trunk/refman-5.6/optimization.xml
   trunk/refman-5.6/replication-configuration.xml
   trunk/refman-5.6/replication-notes.xml
   trunk/refman-5.6/tutorial.xml


Modified: trunk/refman-5.6/dba-log-files.xml
===================================================================
--- trunk/refman-5.6/dba-log-files.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/dba-log-files.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 39; 2991 bytes

@@ -1267,31 +1267,30 @@
         the MySQL server with
         <option role="mysqld">--binlog-format=<replaceable>type</replaceable></option>.
         The supported values for <replaceable>type</replaceable> are:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              <literal>STATEMENT</literal> causes logging to be
-              statement-based.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            <literal>STATEMENT</literal> causes logging to be
+            statement-based.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal>ROW</literal> causes logging to be row-based.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            <literal>ROW</literal> causes logging to be row-based.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal>MIXED</literal> causes logging to use mixed
-              format.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            <literal>MIXED</literal> causes logging to use mixed format.
+          </para>
+        </listitem>
 
-        </itemizedlist>
-      </para>
+      </itemizedlist>
 
       <para>
         The logging format also can be switched at runtime. To specify

@@ -1371,31 +1370,33 @@
       <para>
         There are exceptions when you cannot switch the replication
         format at runtime:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              From within a stored function or a trigger
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            From within a stored function or a trigger
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              If the <literal role="se">NDBCLUSTER</literal> storage
-              engine is enabled
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            If the <literal role="se">NDBCLUSTER</literal> storage
+            engine is enabled
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              If the session is currently in row-based replication mode
-              and has open temporary tables
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            If the session is currently in row-based replication mode
+            and has open temporary tables
+          </para>
+        </listitem>
 
-        </itemizedlist>
+      </itemizedlist>
 
+      <para>
         Trying to switch the format in any of these cases results in an
         error.
       </para>


Modified: trunk/refman-5.6/functions-core.xml
===================================================================
--- trunk/refman-5.6/functions-core.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/functions-core.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 4, Lines Added: 161, Lines Deleted: 161; 11963 bytes

@@ -15608,30 +15608,33 @@
       <para>
         The XPath syntax supported by these functions is currently
         subject to the following limitations:
+      </para>
 
-        <itemizedlist>
+    </formalpara>
 
-          <listitem>
-            <para>
-              Nodeset-to-nodeset comparison (such as
-              <literal>'/a/b[@c=@d]'</literal>) is not supported.
-            </para>
-          </listitem>
+    <itemizedlist>
 
-          <listitem>
-            <para>
-              All of the standard XPath comparison operators are
-              supported. (Bug#22823)
-            </para>
-          </listitem>
+      <listitem>
+        <para>
+          Nodeset-to-nodeset comparison (such as
+          <literal>'/a/b[@c=@d]'</literal>) is not supported.
+        </para>
+      </listitem>
 
-          <listitem>
-            <para>
-              Relative locator expressions are resolved in the context
-              of the root node. For example, consider the following
-              query and result:
-            </para>
+      <listitem>
+        <para>
+          All of the standard XPath comparison operators are supported.
+          (Bug#22823)
+        </para>
+      </listitem>
 
+      <listitem>
+        <para>
+          Relative locator expressions are resolved in the context of
+          the root node. For example, consider the following query and
+          result:
+        </para>
+
 <programlisting>
 mysql&gt; <userinput>SELECT ExtractValue(</userinput>
     -&gt;   <userinput>'&lt;a&gt;&lt;b c="1"&gt;X&lt;/b&gt;&lt;b c="2"&gt;Y&lt;/b&gt;&lt;/a&gt;',</userinput>

@@ -15645,16 +15648,16 @@
 1 row in set (0.03 sec)
 </programlisting>
 
-            <para>
-              In this case, the locator <literal>a/b</literal> resolves
-              to <literal>/a/b</literal>.
-            </para>
+        <para>
+          In this case, the locator <literal>a/b</literal> resolves to
+          <literal>/a/b</literal>.
+        </para>
 
-            <para>
-              Relative locators are also supported within predicates. In
-              the following example, <literal>d[../@c="1"]</literal> is
-              resolved as <literal>/a/b[@c="1"]/d</literal>:
-            </para>
+        <para>
+          Relative locators are also supported within predicates. In the
+          following example, <literal>d[../@c="1"]</literal> is resolved
+          as <literal>/a/b[@c="1"]/d</literal>:
+        </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ExtractValue(</userinput>

@@ -15671,58 +15674,58 @@
 +--------+
 1 row in set (0.00 sec)
 </programlisting>
+      </listitem>
+
+      <listitem>
+        <para>
+          Locators prefixed with expressions that evaluate as scalar
+          values&mdash;including variable references, literals, numbers,
+          and scalar function calls&mdash;are not permitted, and their
+          use results in an error.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The <literal>::</literal> operator is not supported in
+          combination with node types such as the following:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <literal><replaceable>axis</replaceable>::comment()</literal>
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              Locators prefixed with expressions that evaluate as scalar
-              values&mdash;including variable references, literals,
-              numbers, and scalar function calls&mdash;are not
-              permitted, and their use results in an error.
+              <literal><replaceable>axis</replaceable>::text()</literal>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              The <literal>::</literal> operator is not supported in
-              combination with node types such as the following:
+              <literal><replaceable>axis</replaceable>::processing-instructions()</literal>
             </para>
+          </listitem>
 
-            <itemizedlist>
+          <listitem>
+            <para>
+              <literal><replaceable>axis</replaceable>::node()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal><replaceable>axis</replaceable>::comment()</literal>
-                </para>
-              </listitem>
+        </itemizedlist>
 
-              <listitem>
-                <para>
-                  <literal><replaceable>axis</replaceable>::text()</literal>
-                </para>
-              </listitem>
+        <para>
+          However, name tests (such as
+          <literal><replaceable>axis</replaceable>::<replaceable>name</replaceable></literal>
+          and <literal><replaceable>axis</replaceable>::*</literal>) are
+          supported, as shown in these examples:
+        </para>
 
-              <listitem>
-                <para>
-                  <literal><replaceable>axis</replaceable>::processing-instructions()</literal>
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  <literal><replaceable>axis</replaceable>::node()</literal>
-                </para>
-              </listitem>
-
-            </itemizedlist>
-
-            <para>
-              However, name tests (such as
-              <literal><replaceable>axis</replaceable>::<replaceable>name</replaceable></literal>
-              and <literal><replaceable>axis</replaceable>::*</literal>)
-              are supported, as shown in these examples:
-            </para>
-
 <programlisting>
 mysql&gt; <userinput>SELECT ExtractValue('&lt;a&gt;&lt;b&gt;x&lt;/b&gt;&lt;c&gt;y&lt;/c&gt;&lt;/a&gt;','/a/child::b');</userinput>
 +-------------------------------------------------------+

@@ -15740,134 +15743,131 @@
 +-------------------------------------------------------+
 1 row in set (0.01 sec)
 </programlisting>
+      </listitem>
+
+      <listitem>
+        <para>
+          <quote>Up-and-down</quote> navigation is not supported in
+          cases where the path would lead <quote>above</quote> the root
+          element. That is, you cannot use expressions which match on
+          descendants of ancestors of a given element, where one or more
+          of the ancestors of the current element is also an ancestor of
+          the root element (see Bug#16321).
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          The following XPath functions are not supported, or have known
+          issues as indicated:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <literal>id()</literal>
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              <quote>Up-and-down</quote> navigation is not supported in
-              cases where the path would lead <quote>above</quote> the
-              root element. That is, you cannot use expressions which
-              match on descendants of ancestors of a given element,
-              where one or more of the ancestors of the current element
-              is also an ancestor of the root element (see Bug#16321).
+              <literal>lang()</literal>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              The following XPath functions are not supported, or have
-              known issues as indicated:
+              <literal>local-name()</literal>
             </para>
+          </listitem>
 
-            <itemizedlist>
+          <listitem>
+            <para>
+              <literal>name()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>id()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>namespace-uri()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>lang()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>normalize-space()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>local-name()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>starts-with()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>name()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>string()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>namespace-uri()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>substring-after()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>normalize-space()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>substring-before()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>starts-with()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>translate()</literal>
+            </para>
+          </listitem>
 
-              <listitem>
-                <para>
-                  <literal>string()</literal>
-                </para>
-              </listitem>
+        </itemizedlist>
+      </listitem>
 
-              <listitem>
-                <para>
-                  <literal>substring-after()</literal>
-                </para>
-              </listitem>
+      <listitem>
+        <para>
+          The following axes are not supported:
+        </para>
 
-              <listitem>
-                <para>
-                  <literal>substring-before()</literal>
-                </para>
-              </listitem>
+        <itemizedlist>
 
-              <listitem>
-                <para>
-                  <literal>translate()</literal>
-                </para>
-              </listitem>
+          <listitem>
+            <para>
+              <literal>following-sibling</literal>
+            </para>
+          </listitem>
 
-            </itemizedlist>
+          <listitem>
+            <para>
+              <literal>following</literal>
+            </para>
           </listitem>
 
           <listitem>
             <para>
-              The following axes are not supported:
+              <literal>preceding-sibling</literal>
             </para>
+          </listitem>
 
-            <itemizedlist>
-
-              <listitem>
-                <para>
-                  <literal>following-sibling</literal>
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  <literal>following</literal>
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  <literal>preceding-sibling</literal>
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  <literal>preceding</literal>
-                </para>
-              </listitem>
-
-            </itemizedlist>
+          <listitem>
+            <para>
+              <literal>preceding</literal>
+            </para>
           </listitem>
 
         </itemizedlist>
-      </para>
+      </listitem>
 
-    </formalpara>
+    </itemizedlist>
 
     <para>
       XPath expressions passed as arguments to


Modified: trunk/refman-5.6/optimization.xml
===================================================================
--- trunk/refman-5.6/optimization.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/optimization.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 2, Lines Added: 81, Lines Deleted: 80; 6428 bytes

@@ -17771,57 +17771,59 @@
       <para>
         Other supported comparisons for condition pushdown include the
         following:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              <literal><replaceable>column</replaceable> [NOT] LIKE
-              <replaceable>pattern</replaceable></literal>
-            </para>
+        <listitem>
+          <para>
+            <literal><replaceable>column</replaceable> [NOT] LIKE
+            <replaceable>pattern</replaceable></literal>
+          </para>
 
-            <para>
-              <replaceable>pattern</replaceable> must be a string
-              literal containing the pattern to be matched; for syntax,
-              see <xref linkend="string-comparison-functions"/>.
-            </para>
-          </listitem>
+          <para>
+            <replaceable>pattern</replaceable> must be a string literal
+            containing the pattern to be matched; for syntax, see
+            <xref linkend="string-comparison-functions"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal><replaceable>column</replaceable> IS [NOT]
-              NULL</literal>
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            <literal><replaceable>column</replaceable> IS [NOT]
+            NULL</literal>
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal><replaceable>column</replaceable> IN
-              (<replaceable>value_list</replaceable>)</literal>
-            </para>
+        <listitem>
+          <para>
+            <literal><replaceable>column</replaceable> IN
+            (<replaceable>value_list</replaceable>)</literal>
+          </para>
 
-            <para>
-              Each item in the <replaceable>value_list</replaceable>
-              must be a constant, literal value.
-            </para>
-          </listitem>
+          <para>
+            Each item in the <replaceable>value_list</replaceable> must
+            be a constant, literal value.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal><replaceable>column</replaceable> BETWEEN
-              <replaceable>constant1</replaceable> AND
-              <replaceable>constant2</replaceable></literal>
-            </para>
+        <listitem>
+          <para>
+            <literal><replaceable>column</replaceable> BETWEEN
+            <replaceable>constant1</replaceable> AND
+            <replaceable>constant2</replaceable></literal>
+          </para>
 
-            <para>
-              <replaceable>constant1</replaceable> and
-              <replaceable>constant2</replaceable> must each be a
-              constant, literal value.
-            </para>
-          </listitem>
+          <para>
+            <replaceable>constant1</replaceable> and
+            <replaceable>constant2</replaceable> must each be a
+            constant, literal value.
+          </para>
+        </listitem>
 
-        </itemizedlist>
+      </itemizedlist>
 
+      <para>
         In all of the cases in the preceding list, it is possible for
         the condition to be converted into the form of one or more
         direct comparisons between a column and a constant.

@@ -17855,53 +17857,52 @@
         <para>
           Engine condition pushdown is subject to the following
           limitations:
+        </para>
 
-          <itemizedlist>
+      </formalpara>
 
-            <listitem>
-              <para>
-                Condition pushdown is supported only by the
-                <literal role="se">NDBCLUSTER</literal> storage engine.
-              </para>
-            </listitem>
+      <itemizedlist>
 
-            <listitem>
-              <para>
-                Columns may be compared with constants only; however,
-                this includes expressions which evaluate to constant
-                values.
-              </para>
-            </listitem>
+        <listitem>
+          <para>
+            Condition pushdown is supported only by the
+            <literal role="se">NDBCLUSTER</literal> storage engine.
+          </para>
+        </listitem>
 
-            <listitem>
-              <para>
-                Columns used in comparisons cannot be of any of the
-                <literal role="type">BLOB</literal> or
-                <literal role="type">TEXT</literal> types.
-              </para>
-            </listitem>
+        <listitem>
+          <para>
+            Columns may be compared with constants only; however, this
+            includes expressions which evaluate to constant values.
+          </para>
+        </listitem>
 
-            <listitem>
-              <para>
-                A string value to be compared with a column must use the
-                same collation as the column.
-              </para>
-            </listitem>
+        <listitem>
+          <para>
+            Columns used in comparisons cannot be of any of the
+            <literal role="type">BLOB</literal> or
+            <literal role="type">TEXT</literal> types.
+          </para>
+        </listitem>
 
-            <listitem>
-              <para>
-                Joins are not directly supported; conditions involving
-                multiple tables are pushed separately where possible.
-                Use <literal role="stmt" condition="explain">EXPLAIN
-                EXTENDED</literal> to determine which conditions are
-                actually pushed down.
-              </para>
-            </listitem>
+        <listitem>
+          <para>
+            A string value to be compared with a column must use the
+            same collation as the column.
+          </para>
+        </listitem>
 
-          </itemizedlist>
-        </para>
+        <listitem>
+          <para>
+            Joins are not directly supported; conditions involving
+            multiple tables are pushed separately where possible. Use
+            <literal role="stmt" condition="explain">EXPLAIN
+            EXTENDED</literal> to determine which conditions are
+            actually pushed down.
+          </para>
+        </listitem>
 
-      </formalpara>
+      </itemizedlist>
 
     </section>
 


Modified: trunk/refman-5.6/replication-configuration.xml
===================================================================
--- trunk/refman-5.6/replication-configuration.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/replication-configuration.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 2, Lines Added: 60, Lines Deleted: 60; 6548 bytes

@@ -1211,11 +1211,11 @@
             that you also copy the log files and relay log files.
           </para>
 
-          <note>
-            <para>
-              A common problem that is encountered when adding new
-              replication slaves is that the new slave fails with a
-              series of warning and error messages like these:
+          <para>
+            A common problem that is encountered when adding new
+            replication slaves is that the new slave fails with a series
+            of warning and error messages like these:
+          </para>
 
 <programlisting>
 071118 16:44:10 [Warning] Neither --relay-log nor --relay-log-index were used; so

@@ -1227,68 +1227,68 @@
 071118 16:44:10 <errortext>[ERROR] Failed to initialize the master info structure</errortext>
 </programlisting>
 
-              This is due to the fact that, if the
-              <option role="mysqld">--relay-log</option> option is not
-              specified, the relay log files contain the host name as
-              part of their file names. (This is also true of the relay
-              log index file if the
-              <option role="mysqld">--relay-log-index</option> option is
-              not used. See <xref linkend="replication-options"/>, for
-              more information about these options.)
-            </para>
+          <para>
+            This is due to the fact that, if the
+            <option role="mysqld">--relay-log</option> option is not
+            specified, the relay log files contain the host name as part
+            of their file names. (This is also true of the relay log
+            index file if the
+            <option role="mysqld">--relay-log-index</option> option is
+            not used. See <xref linkend="replication-options"/>, for
+            more information about these options.)
+          </para>
 
-            <para>
-              To avoid this problem, use the same value for
-              <option role="mysqld">--relay-log</option> on the new
-              slave that was used on the existing slave. (If this option
-              was not set explicitly on the existing slave, use
-              <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin</literal>.)
-              If this is not feasible, copy the existing slave's relay
-              log index file to the new slave and set the
-              <option role="mysqld">--relay-log-index</option> option on
-              the new slave to match what was used on the existing
-              slave. (If this option was not set explicitly on the
-              existing slave, use
-              <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively&mdash;if you have already tried to start the
-              new slave (after following the remaining steps in this
-              section) and have encountered errors like those described
-              previously&mdash;then perform the following steps:
+          <para>
+            To avoid this problem, use the same value for
+            <option role="mysqld">--relay-log</option> on the new slave
+            that was used on the existing slave. (If this option was not
+            set explicitly on the existing slave, use
+            <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin</literal>.)
+            If this is not feasible, copy the existing slave's relay log
+            index file to the new slave and set the
+            <option role="mysqld">--relay-log-index</option> option on
+            the new slave to match what was used on the existing slave.
+            (If this option was not set explicitly on the existing
+            slave, use
+            <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
+            Alternatively&mdash;if you have already tried to start the
+            new slave (after following the remaining steps in this
+            section) and have encountered errors like those described
+            previously&mdash;then perform the following steps:
+          </para>
 
-              <orderedlist>
+          <orderedlist>
 
-                <listitem>
-                  <para>
-                    If you have not already done so, issue a
-                    <literal role="stmt">STOP SLAVE</literal> on the new
-                    slave.
-                  </para>
+            <listitem>
+              <para>
+                If you have not already done so, issue a
+                <literal role="stmt">STOP SLAVE</literal> on the new
+                slave.
+              </para>
 
-                  <para>
-                    If you have already started the existing slave
-                    again, issue a <literal role="stmt">STOP
-                    SLAVE</literal> on the existing slave as well.
-                  </para>
-                </listitem>
+              <para>
+                If you have already started the existing slave again,
+                issue a <literal role="stmt">STOP SLAVE</literal> on the
+                existing slave as well.
+              </para>
+            </listitem>
 
-                <listitem>
-                  <para>
-                    Copy the contents of the existing slave's relay log
-                    index file into the new slave's relay log index
-                    file, making sure to overwrite any content already
-                    in the file.
-                  </para>
-                </listitem>
+            <listitem>
+              <para>
+                Copy the contents of the existing slave's relay log
+                index file into the new slave's relay log index file,
+                making sure to overwrite any content already in the
+                file.
+              </para>
+            </listitem>
 
-                <listitem>
-                  <para>
-                    Proceed with the remaining steps in this section.
-                  </para>
-                </listitem>
+            <listitem>
+              <para>
+                Proceed with the remaining steps in this section.
+              </para>
+            </listitem>
 
-              </orderedlist>
-            </para>
-          </note>
+          </orderedlist>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.6/replication-notes.xml
===================================================================
--- trunk/refman-5.6/replication-notes.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/replication-notes.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 5, Lines Added: 146, Lines Deleted: 157; 16180 bytes

@@ -604,26 +604,28 @@
         In all cases where the source and target tables do not have
         identical definitions, the following must be true for
         replication to work:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              You must be using row-based replication. (Using
-              <literal>MIXED</literal> for the binary logging format
-              does not work.)
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            You must be using row-based replication. (Using
+            <literal>MIXED</literal> for the binary logging format does
+            not work.)
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              The database and table names must be the same on both the
-              master and the slave.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            The database and table names must be the same on both the
+            master and the slave.
+          </para>
+        </listitem>
 
-        </itemizedlist>
+      </itemizedlist>
 
+      <para>
         Additional conditions are discussed, with examples, in the
         following two sections.
       </para>

@@ -636,40 +638,41 @@
           You can replicate a table from the master to the slave such
           that the master and slave copies of the table have differing
           numbers of columns, subject to the following conditions:
+        </para>
 
-          <itemizedlist>
+        <itemizedlist>
 
-            <listitem>
-              <para>
-                Columns common to both versions of the table must be
-                defined in the same order on the master and the slave.
-              </para>
+          <listitem>
+            <para>
+              Columns common to both versions of the table must be
+              defined in the same order on the master and the slave.
+            </para>
 
-              <para>
-                (This is true even if both tables have the same number
-                of columns.)
-              </para>
-            </listitem>
+            <para>
+              (This is true even if both tables have the same number of
+              columns.)
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Columns common to both versions of the table must be
-                defined before any additional columns.
-              </para>
+          <listitem>
+            <para>
+              Columns common to both versions of the table must be
+              defined before any additional columns.
+            </para>
 
-              <para>
-                This means that executing an <literal role="stmt">ALTER
-                TABLE</literal> statement on the slave where a new
-                column is inserted into the table within the range of
-                columns common to both tables causes replication to
-                fail, as shown in the following example:
-              </para>
+            <para>
+              This means that executing an <literal role="stmt">ALTER
+              TABLE</literal> statement on the slave where a new column
+              is inserted into the table within the range of columns
+              common to both tables causes replication to fail, as shown
+              in the following example:
+            </para>
 
-              <para>
-                Suppose that a table <literal>t</literal>, existing on
-                the master and the slave, is defined by the following
-                <literal role="stmt">CREATE TABLE</literal> statement:
-              </para>
+            <para>
+              Suppose that a table <literal>t</literal>, existing on the
+              master and the slave, is defined by the following
+              <literal role="stmt">CREATE TABLE</literal> statement:
+            </para>
 
 <programlisting>
 CREATE TABLE t (

@@ -679,66 +682,63 @@
 ); 
 </programlisting>
 
-              <para>
-                Suppose that the <literal role="stmt">ALTER
-                TABLE</literal> statement shown here is executed on the
-                slave:
-              </para>
+            <para>
+              Suppose that the <literal role="stmt">ALTER
+              TABLE</literal> statement shown here is executed on the
+              slave:
+            </para>
 
 <programlisting>
 ALTER TABLE t ADD COLUMN cnew1 INT AFTER c3;
 </programlisting>
 
-              <para>
-                The previous <literal role="stmt">ALTER TABLE</literal>
-                is permitted on the slave because the columns
-                <literal>c1</literal>, <literal>c2</literal>, and
-                <literal>c3</literal> that are common to both versions
-                of table <literal>t</literal> remain grouped together in
-                both versions of the table, before any columns that
-                differ.
-              </para>
+            <para>
+              The previous <literal role="stmt">ALTER TABLE</literal> is
+              permitted on the slave because the columns
+              <literal>c1</literal>, <literal>c2</literal>, and
+              <literal>c3</literal> that are common to both versions of
+              table <literal>t</literal> remain grouped together in both
+              versions of the table, before any columns that differ.
+            </para>
 
-              <para>
-                However, the following <literal role="stmt">ALTER
-                TABLE</literal> statement cannot be executed on the
-                slave without causing replication to break:
-              </para>
+            <para>
+              However, the following <literal role="stmt">ALTER
+              TABLE</literal> statement cannot be executed on the slave
+              without causing replication to break:
+            </para>
 
 <programlisting>
 ALTER TABLE t ADD COLUMN cnew2 INT AFTER c3;
 </programlisting>
 
-              <para>
-                Replication fails after execution on the slave of the
-                <literal role="stmt">ALTER TABLE</literal> statement
-                just shown, because the new column
-                <literal>cnew2</literal> comes between columns common to
-                both versions of <literal>t</literal>.
-              </para>
-            </listitem>
+            <para>
+              Replication fails after execution on the slave of the
+              <literal role="stmt">ALTER TABLE</literal> statement just
+              shown, because the new column <literal>cnew2</literal>
+              comes between columns common to both versions of
+              <literal>t</literal>.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Each <quote>extra</quote> column in the version of the
-                table having more columns must have a default value.
-              </para>
+          <listitem>
+            <para>
+              Each <quote>extra</quote> column in the version of the
+              table having more columns must have a default value.
+            </para>
 
-              <note>
-                <para>
-                  A column's default value is determined by a number of
-                  factors, including its type, whether it is defined
-                  with a <literal>DEFAULT</literal> option, whether it
-                  is declared as <literal>NULL</literal>, and the server
-                  SQL mode in effect at the time of its creation; for
-                  more information, see
-                  <xref linkend="data-type-defaults"/>).
-                </para>
-              </note>
-            </listitem>
+            <para>
+              A column's default value is determined by a number of
+              factors, including its type, whether it is defined with a
+              <literal>DEFAULT</literal> option, whether it is declared
+              as <literal>NULL</literal>, and the server SQL mode in
+              effect at the time of its creation; for more information,
+              see <xref linkend="data-type-defaults"/>).
+            </para>
+          </listitem>
 
-          </itemizedlist>
+        </itemizedlist>
 
+        <para>
           In addition, when the slave's copy of the table has more
           columns than the master's copy, each column common to the
           tables must use the same data type in both tables.

@@ -751,100 +751,89 @@
           <para>
             The following examples illustrate some valid and invalid
             table definitions:
+          </para>
 
-            <itemizedlist>
+        </formalpara>
 
-              <listitem>
-                <formalpara>
+        <formalpara>
 
-                  <title>More columns on the master</title>
+          <title>More columns on the master</title>
 
-                  <para>
-                    The following table definitions are valid and
-                    replicate correctly:
+          <para>
+            The following table definitions are valid and replicate
+            correctly:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 INT, c3 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c1 INT, c2 INT);</userinput>
 </programlisting>
 
-                    The following table definitions would raise Error
-                    1532
-                    (<literal role="error">ER_BINLOG_ROW_RBR_TO_SBR</literal>)
-                    because the definitions of the columns common to
-                    both versions of the table are in a different order
-                    on the slave than they are on the master:
+            The following table definitions would raise Error 1532
+            (<literal role="error">ER_BINLOG_ROW_RBR_TO_SBR</literal>)
+            because the definitions of the columns common to both
+            versions of the table are in a different order on the slave
+            than they are on the master:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 INT, c3 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c2 INT, c1 INT);</userinput>
 </programlisting>
 
-                    The following table definitions would also raise
-                    Error 1532 because the definition of the extra
-                    column on the master appears before the definitions
-                    of the columns common to both versions of the table:
+            The following table definitions would also raise Error 1532
+            because the definition of the extra column on the master
+            appears before the definitions of the columns common to both
+            versions of the table:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c3 INT, c1 INT, c2 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c1 INT, c2 INT);</userinput>
 </programlisting>
-                  </para>
+          </para>
 
-                </formalpara>
-              </listitem>
+        </formalpara>
 
-              <listitem>
-                <formalpara>
+        <formalpara>
 
-                  <title>More columns on the slave</title>
+          <title>More columns on the slave</title>
 
-                  <para>
-                    The following table definitions are valid and
-                    replicate correctly:
+          <para>
+            The following table definitions are valid and replicate
+            correctly:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c1 INT, c2 INT, c3 INT);</userinput>
                   </programlisting>
 
-                    The following definitions raise Error 1532 because
-                    the columns common to both versions of the table are
-                    not defined in the same order on both the master and
-                    the slave:
+            The following definitions raise Error 1532 because the
+            columns common to both versions of the table are not defined
+            in the same order on both the master and the slave:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c2 INT, c1 INT, c3 INT);</userinput>
 </programlisting>
 
-                    The following table definitions also raise Error
-                    1532 because the definition for the extra column in
-                    the slave's version of the table appears before the
-                    definitions for the columns which are common to both
-                    versions of the table:
+            The following table definitions also raise Error 1532
+            because the definition for the extra column in the slave's
+            version of the table appears before the definitions for the
+            columns which are common to both versions of the table:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 INT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c3 INT, c1 INT, c2 INT);</userinput>
 </programlisting>
 
-                    The following table definitions fail because the
-                    slave's version of the table has additional columns
-                    compared to the master's version, and the two
-                    versions of the table use different data types for
-                    the common column <literal>c2</literal>:
+            The following table definitions fail because the slave's
+            version of the table has additional columns compared to the
+            master's version, and the two versions of the table use
+            different data types for the common column
+            <literal>c2</literal>:
 
 <programlisting>
 master&gt; <userinput>CREATE TABLE t1 (c1 INT, c2 BIGINT);</userinput>
 slave&gt;  <userinput>CREATE TABLE t1 (c1 INT, c2 INT, c3 INT);</userinput>
 </programlisting>
-                  </para>
-
-                </formalpara>
-              </listitem>
-
-            </itemizedlist>
           </para>
 
         </formalpara>

@@ -2137,34 +2126,34 @@
         correctly with statement-based replication only if they also
         contain an <literal>ORDER BY</literal> clause.) When such a
         statement is encountered:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              When using <literal>STATEMENT</literal> mode, a warning
-              that the statement is not safe for statement-based
-              replication is now issued.
-            </para>
+        <listitem>
+          <para>
+            When using <literal>STATEMENT</literal> mode, a warning that
+            the statement is not safe for statement-based replication is
+            now issued.
+          </para>
 
-            <para>
-              Currently, when using <literal>STATEMENT</literal> mode,
-              warnings are issued for DML statements containing
-              <literal>LIMIT</literal> even when they also have an
-              <literal>ORDER BY</literal> clause (and so are made
-              deterministic). This is a known issue. (Bug#42851)
-            </para>
-          </listitem>
+          <para>
+            Currently, when using <literal>STATEMENT</literal> mode,
+            warnings are issued for DML statements containing
+            <literal>LIMIT</literal> even when they also have an
+            <literal>ORDER BY</literal> clause (and so are made
+            deterministic). This is a known issue. (Bug#42851)
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              When using <literal>MIXED</literal> mode, the statement is
-              now automatically replicated using row-based mode.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            When using <literal>MIXED</literal> mode, the statement is
+            now automatically replicated using row-based mode.
+          </para>
+        </listitem>
 
-        </itemizedlist>
-      </para>
+      </itemizedlist>
 
     </section>
 


Modified: trunk/refman-5.6/tutorial.xml
===================================================================
--- trunk/refman-5.6/tutorial.xml	2011-06-30 15:20:49 UTC (rev 26652)
+++ trunk/refman-5.6/tutorial.xml	2011-06-30 15:23:11 UTC (rev 26653)
Changed blocks: 1, Lines Added: 48, Lines Deleted: 50; 3993 bytes

@@ -3946,64 +3946,62 @@
       <para>
         More information about <literal>AUTO_INCREMENT</literal> is
         available here:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              How to assign the <literal>AUTO_INCREMENT</literal>
-              attribute to a column: <xref linkend="create-table"/>, and
-              <xref linkend="alter-table"/>.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            How to assign the <literal>AUTO_INCREMENT</literal>
+            attribute to a column: <xref linkend="create-table"/>, and
+            <xref linkend="alter-table"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              How <literal>AUTO_INCREMENT</literal> behaves depending on
-              the
-              <literal role="sqlmode">NO_AUTO_VALUE_ON_ZERO</literal>
-              SQL mode: <xref linkend="server-sql-mode"/>.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            How <literal>AUTO_INCREMENT</literal> behaves depending on
+            the <literal role="sqlmode">NO_AUTO_VALUE_ON_ZERO</literal>
+            SQL mode: <xref linkend="server-sql-mode"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              How to use the
-              <literal role="func">LAST_INSERT_ID()</literal> function
-              to find the row that contains the most recent
-              <literal>AUTO_INCREMENT</literal> value:
-              <xref linkend="information-functions"/>.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            How to use the
+            <literal role="func">LAST_INSERT_ID()</literal> function to
+            find the row that contains the most recent
+            <literal>AUTO_INCREMENT</literal> value:
+            <xref linkend="information-functions"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              Setting the <literal>AUTO_INCREMENT</literal> value to be
-              used: <xref linkend="server-system-variables"/>.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            Setting the <literal>AUTO_INCREMENT</literal> value to be
+            used: <xref linkend="server-system-variables"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              <literal>AUTO_INCREMENT</literal> and replication:
-              <xref linkend="replication-features-auto-increment"/>.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            <literal>AUTO_INCREMENT</literal> and replication:
+            <xref linkend="replication-features-auto-increment"/>.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              Server-system variables related to
-              <literal>AUTO_INCREMENT</literal>
-              (<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>
-          </listitem>
+        <listitem>
+          <para>
+            Server-system variables related to
+            <literal>AUTO_INCREMENT</literal>
+            (<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>
+        </listitem>
 
-        </itemizedlist>
-      </para>
+      </itemizedlist>
 
     </section>
 


Thread
svn commit - mysqldoc@oter02: r26653 - trunk/refman-5.6jon.stephens4 Jul