svn commit - mysqldoc@docsrva: r10562 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-5.0 refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2008-04-22 15:32:35 +0200 (Tue, 22 Apr 2008)
New Revision: 10562

Log:
 r30887@frost:  paul | 2008-04-22 08:32:37 -0500
 Minor fixes. (Shane)


Modified:
   trunk/it/refman-5.1/restrictions.xml
   trunk/it/refman-5.1/sql-syntax.xml
   trunk/pt/refman-5.1/restrictions.xml
   trunk/pt/refman-5.1/sql-syntax.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-6.0/sql-syntax.xml

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


Modified: trunk/it/refman-5.1/restrictions.xml
===================================================================
--- trunk/it/refman-5.1/restrictions.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/it/refman-5.1/restrictions.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes

@@ -434,7 +434,7 @@
     <para>
       You cannot use a cursor for a statement that generates a result
       set if the statement is not supported in prepared mode. This
-      includes statements such as <literal>CHECK TABLES</literal>,
+      includes statements such as <literal>CHECK TABLE</literal>,
       <literal>HANDLER READ</literal>, and <literal>SHOW BINLOG
       EVENTS</literal>.
     </para>


Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/it/refman-5.1/sql-syntax.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 552 bytes

@@ -14748,7 +14748,7 @@
       </para>
 
       <para>
-        Statements that cause implicit cannot be used in an XA
+        Statements that cause an implicit commit cannot be used in an XA
         transaction while the transaction is in an
         <literal>ACTIVE</literal> state.
       </para>


Modified: trunk/pt/refman-5.1/restrictions.xml
===================================================================
--- trunk/pt/refman-5.1/restrictions.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/pt/refman-5.1/restrictions.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes

@@ -434,7 +434,7 @@
     <para>
       You cannot use a cursor for a statement that generates a result
       set if the statement is not supported in prepared mode. This
-      includes statements such as <literal>CHECK TABLES</literal>,
+      includes statements such as <literal>CHECK TABLE</literal>,
       <literal>HANDLER READ</literal>, and <literal>SHOW BINLOG
       EVENTS</literal>.
     </para>


Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/pt/refman-5.1/sql-syntax.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 552 bytes

@@ -14748,7 +14748,7 @@
       </para>
 
       <para>
-        Statements that cause implicit cannot be used in an XA
+        Statements that cause an implicit commit cannot be used in an XA
         transaction while the transaction is in an
         <literal>ACTIVE</literal> state.
       </para>


Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-5.0/restrictions.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1000 bytes

@@ -56,7 +56,7 @@
       <listitem>
         <para>
           The table-maintenance statements <literal>CHECK
-          TABLES</literal> and <literal>OPTIMIZE TABLES</literal>. This
+          TABLE</literal> and <literal>OPTIMIZE TABLE</literal>. This
           restriction is lifted beginning with MySQL 5.0.17.
         </para>
       </listitem>

@@ -380,7 +380,7 @@
     <para>
       You cannot use a cursor for a statement that generates a result
       set if the statement is not supported in prepared mode. This
-      includes statements such as <literal>CHECK TABLES</literal>,
+      includes statements such as <literal>CHECK TABLE</literal>,
       <literal>HANDLER READ</literal>, and <literal>SHOW BINLOG
       EVENTS</literal>.
     </para>


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-5.0/sql-syntax.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 543 bytes

@@ -12172,7 +12172,7 @@
       </para>
 
       <para>
-        Statements that cause implicit cannot be used in an XA
+        Statements that cause an implicit commit cannot be used in an XA
         transaction while the transaction is in an
         <literal>ACTIVE</literal> state.
       </para>


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-5.1/restrictions.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 656 bytes

@@ -434,7 +434,7 @@
     <para>
       You cannot use a cursor for a statement that generates a result
       set if the statement is not supported in prepared mode. This
-      includes statements such as <literal>CHECK TABLES</literal>,
+      includes statements such as <literal>CHECK TABLE</literal>,
       <literal>HANDLER READ</literal>, and <literal>SHOW BINLOG
       EVENTS</literal>.
     </para>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-5.1/sql-syntax.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 543 bytes

@@ -14765,7 +14765,7 @@
       </para>
 
       <para>
-        Statements that cause implicit cannot be used in an XA
+        Statements that cause an implicit commit cannot be used in an XA
         transaction while the transaction is in an
         <literal>ACTIVE</literal> state.
       </para>


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-6.0/restrictions.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 656 bytes

@@ -423,7 +423,7 @@
     <para>
       You cannot use a cursor for a statement that generates a result
       set if the statement is not supported in prepared mode. This
-      includes statements such as <literal>CHECK TABLES</literal>,
+      includes statements such as <literal>CHECK TABLE</literal>,
       <literal>HANDLER READ</literal>, and <literal>SHOW BINLOG
       EVENTS</literal>.
     </para>


Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml	2008-04-22 03:46:35 UTC (rev 10561)
+++ trunk/refman-6.0/sql-syntax.xml	2008-04-22 13:32:35 UTC (rev 10562)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 543 bytes

@@ -15220,7 +15220,7 @@
       </para>
 
       <para>
-        Statements that cause implicit cannot be used in an XA
+        Statements that cause an implicit commit cannot be used in an XA
         transaction while the transaction is in an
         <literal>ACTIVE</literal> state.
       </para>