svn commit - mysqldoc@docsrva: r9706 - in trunk: . refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2008-02-05 05:15:49 +0100 (Tue, 05 Feb 2008)
New Revision: 9706

Log:
 r28949@frost:  paul | 2008-02-04 22:13:24 -0600
 Update 6.0 roadmap in 5.1 manual (harmonize to text in 6.0 manual).


Modified:
   trunk/refman-5.1/introduction.xml
   trunk/refman-6.0/introduction.xml

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


Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2008-02-05 00:15:06 UTC (rev 9705)
+++ trunk/refman-5.1/introduction.xml	2008-02-05 04:15:49 UTC (rev 9706)
Changed blocks: 3, Lines Added: 35, Lines Deleted: 14; 3522 bytes

@@ -682,11 +682,11 @@
 
           <listitem>
             <para>
-              Improvements in the <literal>INFORMATION_SCHEMA</literal>
-              database, with new columns added to
-              <literal>INFORMATION_SCHEMA.ROUTINES</literal>, and the
-              addition of the
-              <literal>INFORMATION_SCHEMA.PARAMETERS</literal> table.
+              Support for additional Unicode character sets:
+              <literal>utf16</literal>, <literal>utf32</literal>,
and
+              4-byte <literal>utf8</literal>. These character sets
+              support supplementary Unicode characters; that is,
+              characters outside the Basic Multilingual Plane (BMP).
             </para>
           </listitem>
 

@@ -700,6 +700,16 @@
 
           <listitem>
             <para>
+              Improvements in the <literal>INFORMATION_SCHEMA</literal>
+              database, with the addition of the
+              <literal>INFORMATION_SCHEMA.PARAMETERS</literal> table,
+              and new columns added to
+              <literal>INFORMATION_SCHEMA.ROUTINES</literal>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               Optimizer enhancements for faster subqueries and joins,
               including batched index access of table rows for sequences
               of disjoint ranges by the <literal>MyISAM</literal> and

@@ -717,16 +727,27 @@
 
           <listitem>
             <para>
-              The <literal>LOCK TABLE</literal> statement no longer
-              commits transactions automatically. Following
-              <literal>LOCK TABLE</literal>, you can now access tables
-              not mentioned in the <literal>LOCK TABLE</literal>
-              statement. You can now also issue <literal>LOCK
-              TABLE</literal> many times in succession, adding
-              additional tables to the locked set, and without unlocking
-              any tables that were locked previously; tables are not
-              unlocked until the transaction is committed.
+              The syntax for the <literal>LOCK TABLES</literal>
+              statement is extended to support transactional table locks
+              that do not commit transactions automatically. Following
+              <literal>LOCK TABLES ... IN SHARE MODE</literal> or
+              <literal>LOCK TABLES ... IN EXCLUSIVE MODE</literal>, you
+              can access tables not mentioned in the <literal>LOCK
+              TABLES</literal> statement. You can now also issue these
+              extended <literal>LOCK TABLES</literal> statements many
+              times in succession, adding additional tables to the
+              locked set, and without unlocking any tables that were
+              locked previously. When using <literal>LOCK
+              TABLES</literal> with <literal>IN SHARE MODE</literal> or
+              <literal>IN EXCLUSIVE MODE</literal>, tables are not
+              unlocked until the transaction ends.
             </para>
+
+            <para>
+              The behavior of <literal>LOCK TABLES</literal> when not
+              using <literal>IN SHARE MODE</literal> or <literal>IN
+              EXCLUSIVE MODE</literal> remains unchanged.
+            </para>
           </listitem>
 
           <listitem>


Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml	2008-02-05 00:15:06 UTC (rev 9705)
+++ trunk/refman-6.0/introduction.xml	2008-02-05 04:15:49 UTC (rev 9706)
Changed blocks: 2, Lines Added: 18, Lines Deleted: 10; 1623 bytes

@@ -395,6 +395,24 @@
 
           <listitem>
             <para>
+              Support for additional Unicode character sets:
+              <literal>utf16</literal>, <literal>utf32</literal>,
and
+              4-byte <literal>utf8</literal>. These character sets
+              support supplementary Unicode characters; that is,
+              characters outside the Basic Multilingual Plane (BMP).
+            </para>
+          </listitem>
+
+<!--
+          <listitem>
+            <para>
+              A tool for online backup.
+            </para>
+          </listitem>
+-->
+
+          <listitem>
+            <para>
               Improvements in the <literal>INFORMATION_SCHEMA</literal>
               database, with the addition of the
               <literal>INFORMATION_SCHEMA.PARAMETERS</literal> table,

@@ -463,16 +481,6 @@
             </para>
           </listitem>
 
-          <listitem>
-            <para>
-              Support for additional Unicode character sets:
-              <literal>utf16</literal>, <literal>utf32</literal>,
and
-              4-byte <literal>utf8</literal>. These character sets
-              support supplementary Unicode characters; that is,
-              characters outside the Basic Multilingual Plane (BMP).
-            </para>
-          </listitem>
-
         </itemizedlist>
 
         In addition, several improvements have been made for MySQL