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

[paul]

Author: paul
Date: 2006-12-15 19:31:05 +0100 (Fri, 15 Dec 2006)
New Revision: 4279

Log:
 r17292@polar:  paul | 2006-12-15 12:30:08 -0600
 Point out that table_type is removed in 5.2.
 Remove a 5.1 example that uses it.


Modified:
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/storage-engines.xml

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


Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-12-15 18:04:20 UTC (rev 4278)
+++ trunk/refman-5.1/database-administration.xml	2006-12-15 18:31:05 UTC (rev 4279)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1634 bytes

@@ -4585,7 +4585,7 @@
               is <literal>NO</literal>, the server can use only
               statement-based logging. See
               <xref linkend="replication-row-based"/>. This variable was
-              added in MySQL 5.1.5. This variable was removed in 5.1.15. 
+              added in MySQL 5.1.5. This variable was removed in 5.1.15.
             </para>
           </listitem>
 

@@ -5263,11 +5263,10 @@
               <xref linkend="too-many-connections"/>, for more
               information.
             </para>
-            
+
             <para>
-              Increasing this value
-              increases the number of file descriptors that
-              <command>mysqld</command> requires. See
+              Increasing this value increases the number of file
+              descriptors that <command>mysqld</command> requires. See
               <xref linkend="table-cache"/>, for comments on file
               descriptor limits.
             </para>

@@ -6848,7 +6847,8 @@
               This variable is a synonym for
               <literal>storage_engine</literal>. In MySQL
               &current-series;, <literal>storage_engine</literal> is the
-              preferred name.
+              preferred name. In MySQL &next-series;,
+              <literal>table_type</literal> will be removed.
             </para>
           </listitem>
 


Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-12-15 18:04:20 UTC (rev 4278)
+++ trunk/refman-5.1/storage-engines.xml	2006-12-15 18:31:05 UTC (rev 4279)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 608 bytes

@@ -953,12 +953,11 @@
     <para>
       You can set the default storage engine to be used during the
       current session by setting the <literal>storage_engine</literal>
-      or <literal>table_type</literal> variable:
+      variable:
     </para>
 
 <programlisting>
 SET storage_engine=MYISAM;
-SET table_type=INNODB;
 </programlisting>
 
     <para>