MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul.dubois Date:February 25 2009 7:39pm
Subject:svn commit - mysqldoc@docsrva: r13924 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
View as plain text  
Author: paul
Date: 2009-02-25 20:39:56 +0100 (Wed, 25 Feb 2009)
New Revision: 13924

Log:
 r38945@frost:  paul | 2009-02-25 13:42:21 -0500
 Updates to indicate how to tell which storage engines are available,
 not state that InnoDB is available by default


Modified:
   trunk/refman-4.1/se-innodb-core.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-5.0/se-innodb-core.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.1-maria/storage-engines.xml
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.1/storage-engines-core.xml
   trunk/refman-6.0/se-innodb-core.xml
   trunk/refman-6.0/storage-engines-core.xml

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


Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-4.1/se-innodb-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 5; 1595 bytes

@@ -57,17 +57,23 @@
   </para>
 
   <para>
+    To determine whether your server supports <literal>InnoDB</literal>
+    use the <literal role="stmt">SHOW ENGINES</literal> statement. See
+    <xref linkend="show-engines"/>.
+  </para>
+
+  <para>
     <literal>InnoDB</literal> has been designed for maximum performance
     when processing large data volumes. Its CPU efficiency is probably
     not matched by any other disk-based relational database engine.
   </para>
 
   <para>
-    Fully integrated with MySQL Server, the <literal>InnoDB</literal>
-    storage engine maintains its own buffer pool for caching data and
-    indexes in main memory. <literal>InnoDB</literal> stores its tables
-    and indexes in a tablespace, which may consist of several files (or
-    raw disk partitions). This is different from, for example,
+    The <literal>InnoDB</literal> storage engine maintains its own
+    buffer pool for caching data and indexes in main memory.
+    <literal>InnoDB</literal> stores its tables and indexes in a
+    tablespace, which may consist of several files (or raw disk
+    partitions). This is different from, for example,
     <literal>MyISAM</literal> tables where each table is stored using
     separate files. <literal>InnoDB</literal> tables can be very large
     even on operating systems where file size is limited to 2GB.


Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-4.1/storage-engines.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1734 bytes

@@ -179,6 +179,41 @@
   </itemizedlist>
 
   <para>
+    To determine which storage engines your server supports by using the
+    <literal role="stmt">SHOW ENGINES</literal> statement. The value in
+    the <literal>Support</literal> column indicates whether an engine
+    can be used. A value of <literal>YES</literal>,
+    <literal>NO</literal>, or <literal>DEFAULT</literal> indicates that
+    an engine is available, not available, or avaiable and current set
+    as the default storage engine.
+  </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+ Engine: MyISAM
+Support: DEFAULT
+Comment: Default engine as of MySQL 3.23 with great performance
+*************************** 2. row ***************************
+ Engine: HEAP
+Support: YES
+Comment: Alias for MEMORY
+*************************** 3. row ***************************
+ Engine: MEMORY
+Support: YES
+Comment: Hash based, stored in memory, useful for temporary tables
+*************************** 4. row ***************************
+ Engine: MERGE
+Support: YES
+Comment: Collection of identical MyISAM tables
+*************************** 5. row ***************************
+ Engine: MRG_MYISAM
+Support: YES
+Comment: Alias for MERGE
+...
+</programlisting>
+
+  <para>
     This chapter describes each of the MySQL storage engines except for
     <literal role="se">NDBCLUSTER</literal>, which is covered in
     <xref linkend="mysql-cluster"/>.


Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-5.0/se-innodb-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 11; 2499 bytes

@@ -57,17 +57,23 @@
   </para>
 
   <para>
+    To determine whether your server supports <literal>InnoDB</literal>
+    use the <literal role="stmt">SHOW ENGINES</literal> statement. See
+    <xref linkend="show-engines"/>.
+  </para>
+
+  <para>
     <literal>InnoDB</literal> has been designed for maximum performance
     when processing large data volumes. Its CPU efficiency is probably
     not matched by any other disk-based relational database engine.
   </para>
 
   <para>
-    Fully integrated with MySQL Server, the <literal>InnoDB</literal>
-    storage engine maintains its own buffer pool for caching data and
-    indexes in main memory. <literal>InnoDB</literal> stores its tables
-    and indexes in a tablespace, which may consist of several files (or
-    raw disk partitions). This is different from, for example,
+    The <literal>InnoDB</literal> storage engine maintains its own
+    buffer pool for caching data and indexes in main memory.
+    <literal>InnoDB</literal> stores its tables and indexes in a
+    tablespace, which may consist of several files (or raw disk
+    partitions). This is different from, for example,
     <literal>MyISAM</literal> tables where each table is stored using
     separate files. <literal>InnoDB</literal> tables can be very large
     even on operating systems where file size is limited to 2GB.

@@ -75,7 +81,8 @@
 
   <para>
     The Windows Essentials installer makes <literal>InnoDB</literal> the
-    MySQL default storage engine on Windows.
+    MySQL default storage engine on Windows, if the server being
+    installed supports <literal>InnoDB</literal>.
   </para>
 
   <para>

@@ -191,11 +198,9 @@
     <title><literal>InnoDB</literal> Configuration</title>
 
     <para>
-      The <literal>InnoDB</literal> storage engine is enabled by
-      default. If you do not want to use <literal>InnoDB</literal>
-      tables, start the server with the
-      <option role="mysqld">--skip-innodb</option> option to disable the
-      <literal>InnoDB</literal> startup engine.
+      If you do not want to use <literal>InnoDB</literal> tables, start
+      the server with the <option role="mysqld">--skip-innodb</option>
+      option to disable the <literal>InnoDB</literal> startup engine.
     </para>
 
     <caution>


Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-5.0/storage-engines.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1835 bytes

@@ -200,6 +200,41 @@
   </itemizedlist>
 
   <para>
+    To determine which storage engines your server supports by using the
+    <literal role="stmt">SHOW ENGINES</literal> statement. The value in
+    the <literal>Support</literal> column indicates whether an engine
+    can be used. A value of <literal>YES</literal>,
+    <literal>NO</literal>, or <literal>DEFAULT</literal> indicates that
+    an engine is available, not available, or avaiable and current set
+    as the default storage engine.
+  </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+ Engine: MyISAM
+Support: DEFAULT
+Comment: Default engine as of MySQL 3.23 with great performance
+*************************** 2. row ***************************
+ Engine: MEMORY
+Support: YES
+Comment: Hash based, stored in memory, useful for temporary tables
+*************************** 3. row ***************************
+ Engine: InnoDB
+Support: YES
+Comment: Supports transactions, row-level locking, and foreign keys
+*************************** 4. row ***************************
+ Engine: BerkeleyDB
+Support: NO
+Comment: Supports transactions and page-level locking
+*************************** 5. row ***************************
+ Engine: BLACKHOLE
+Support: YES
+Comment: /dev/null storage engine (anything you write to it disappears)
+...
+</programlisting>
+
+  <para>
     This chapter describes each of the MySQL storage engines except for
     <literal role="se">NDBCLUSTER</literal>, which is covered in
     <xref linkend="mysql-cluster"/>.


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-5.1/se-innodb-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 11; 2449 bytes

@@ -56,6 +56,12 @@
     other MySQL storage engines, even within the same statement.
   </para>
 
+  <para>
+    To determine whether your server supports <literal>InnoDB</literal>
+    use the <literal role="stmt">SHOW ENGINES</literal> statement. See
+    <xref linkend="show-engines"/>.
+  </para>
+
   <para condition="dynamic:storageengines:singlesummary" role="6.0:innodb"/>
 
   <para>

@@ -65,11 +71,11 @@
   </para>
 
   <para>
-    Fully integrated with MySQL Server, the <literal>InnoDB</literal>
-    storage engine maintains its own buffer pool for caching data and
-    indexes in main memory. <literal>InnoDB</literal> stores its tables
-    and indexes in a tablespace, which may consist of several files (or
-    raw disk partitions). This is different from, for example,
+    The <literal>InnoDB</literal> storage engine maintains its own
+    buffer pool for caching data and indexes in main memory.
+    <literal>InnoDB</literal> stores its tables and indexes in a
+    tablespace, which may consist of several files (or raw disk
+    partitions). This is different from, for example,
     <literal>MyISAM</literal> tables where each table is stored using
     separate files. <literal>InnoDB</literal> tables can be very large
     even on operating systems where file size is limited to 2GB.

@@ -77,7 +83,8 @@
 
   <para>
     The Windows Essentials installer makes <literal>InnoDB</literal> the
-    MySQL default storage engine on Windows.
+    MySQL default storage engine on Windows, if the server being
+    installed supports <literal>InnoDB</literal>.
   </para>
 
   <para>

@@ -223,11 +230,9 @@
     <title><literal>InnoDB</literal> Configuration</title>
 
     <para>
-      The <literal>InnoDB</literal> storage engine is enabled by
-      default. If you do not want to use <literal>InnoDB</literal>
-      tables, start the server with the
-      <option role="mysqld">--skip-innodb</option> option to disable the
-      <literal>InnoDB</literal> startup engine.
+      If you do not want to use <literal>InnoDB</literal> tables, start
+      the server with the <option role="mysqld">--skip-innodb</option>
+      option to disable the <literal>InnoDB</literal> startup engine.
     </para>
 
     <caution>


Modified: trunk/refman-5.1/storage-engines-core.xml
===================================================================
--- trunk/refman-5.1/storage-engines-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-5.1/storage-engines-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 36, Lines Deleted: 0; 1720 bytes

@@ -82,6 +82,42 @@
   </para>
 
   <para>
+    To determine which storage engines your server supports by using the
+    <literal role="stmt">SHOW ENGINES</literal> statement. The value in
+    the <literal>Support</literal> column indicates whether an engine
+    can be used. A value of <literal>YES</literal>,
+    <literal>NO</literal>, or <literal>DEFAULT</literal> indicates that
+    an engine is available, not available, or avaiable and current set
+    as the default storage engine.
+  </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+      Engine: FEDERATED
+     Support: NO
+     Comment: Federated MySQL storage engine
+Transactions: NULL
+          XA: NULL
+  Savepoints: NULL
+*************************** 2. row ***************************
+      Engine: MRG_MYISAM
+     Support: YES
+     Comment: Collection of identical MyISAM tables
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 3. row ***************************
+      Engine: MyISAM
+     Support: DEFAULT
+     Comment: Default engine as of MySQL 3.23 with great performance
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+...
+</programlisting>
+
+  <para>
     This chapter describes each of the MySQL storage engines except for
     <literal role="se">NDBCLUSTER</literal>, which is covered in
     <xref linkend="mysql-cluster"/>. It also contains a description of


Modified: trunk/refman-5.1-maria/storage-engines.xml
===================================================================
--- trunk/refman-5.1-maria/storage-engines.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-5.1-maria/storage-engines.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 36, Lines Deleted: 0; 1713 bytes

@@ -80,6 +80,42 @@
   </para>
 
   <para>
+    To determine which storage engines your server supports by using the
+    <literal role="stmt">SHOW ENGINES</literal> statement. The value in
+    the <literal>Support</literal> column indicates whether an engine
+    can be used. A value of <literal>YES</literal>,
+    <literal>NO</literal>, or <literal>DEFAULT</literal> indicates that
+    an engine is available, not available, or avaiable and current set
+    as the default storage engine.
+  </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+      Engine: FEDERATED
+     Support: NO
+     Comment: Federated MySQL storage engine
+Transactions: NULL
+          XA: NULL
+  Savepoints: NULL
+*************************** 2. row ***************************
+      Engine: MRG_MYISAM
+     Support: YES
+     Comment: Collection of identical MyISAM tables
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 3. row ***************************
+      Engine: MyISAM
+     Support: DEFAULT
+     Comment: Default engine as of MySQL 3.23 with great performance
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+...
+</programlisting>
+
+  <para>
     This chapter describes each of the MySQL storage engines except for
     <literal>NDBCLUSTER</literal>, which is covered in
     <xref linkend="mysql-cluster"/>. It also contains a description of


Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-6.0/se-innodb-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 11; 2449 bytes

@@ -56,6 +56,12 @@
     other MySQL storage engines, even within the same statement.
   </para>
 
+  <para>
+    To determine whether your server supports <literal>InnoDB</literal>
+    use the <literal role="stmt">SHOW ENGINES</literal> statement. See
+    <xref linkend="show-engines"/>.
+  </para>
+
   <para condition="dynamic:storageengines:singlesummary" role="6.0:innodb"/>
 
   <para>

@@ -65,11 +71,11 @@
   </para>
 
   <para>
-    Fully integrated with MySQL Server, the <literal>InnoDB</literal>
-    storage engine maintains its own buffer pool for caching data and
-    indexes in main memory. <literal>InnoDB</literal> stores its tables
-    and indexes in a tablespace, which may consist of several files (or
-    raw disk partitions). This is different from, for example,
+    The <literal>InnoDB</literal> storage engine maintains its own
+    buffer pool for caching data and indexes in main memory.
+    <literal>InnoDB</literal> stores its tables and indexes in a
+    tablespace, which may consist of several files (or raw disk
+    partitions). This is different from, for example,
     <literal>MyISAM</literal> tables where each table is stored using
     separate files. <literal>InnoDB</literal> tables can be very large
     even on operating systems where file size is limited to 2GB.

@@ -77,7 +83,8 @@
 
   <para>
     The Windows Essentials installer makes <literal>InnoDB</literal> the
-    MySQL default storage engine on Windows.
+    MySQL default storage engine on Windows, if the server being
+    installed supports <literal>InnoDB</literal>.
   </para>
 
   <para>

@@ -193,11 +200,9 @@
     <title><literal>InnoDB</literal> Configuration</title>
 
     <para>
-      The <literal>InnoDB</literal> storage engine is enabled by
-      default. If you do not want to use <literal>InnoDB</literal>
-      tables, start the server with the
-      <option role="mysqld">--skip-innodb</option> option to disable the
-      <literal>InnoDB</literal> startup engine.
+      If you do not want to use <literal>InnoDB</literal> tables, start
+      the server with the <option role="mysqld">--skip-innodb</option>
+      option to disable the <literal>InnoDB</literal> startup engine.
     </para>
 
     <caution>


Modified: trunk/refman-6.0/storage-engines-core.xml
===================================================================
--- trunk/refman-6.0/storage-engines-core.xml	2009-02-25 17:32:54 UTC (rev 13923)
+++ trunk/refman-6.0/storage-engines-core.xml	2009-02-25 19:39:56 UTC (rev 13924)
Changed blocks: 1, Lines Added: 36, Lines Deleted: 0; 1706 bytes

@@ -86,6 +86,42 @@
   </para>
 
   <para>
+    To determine which storage engines your server supports by using the
+    <literal role="stmt">SHOW ENGINES</literal> statement. The value in
+    the <literal>Support</literal> column indicates whether an engine
+    can be used. A value of <literal>YES</literal>,
+    <literal>NO</literal>, or <literal>DEFAULT</literal> indicates that
+    an engine is available, not available, or avaiable and current set
+    as the default storage engine.
+  </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW ENGINES\G</userinput>
+*************************** 1. row ***************************
+      Engine: FEDERATED
+     Support: NO
+     Comment: Federated MySQL storage engine
+Transactions: NULL
+          XA: NULL
+  Savepoints: NULL
+*************************** 2. row ***************************
+      Engine: MRG_MYISAM
+     Support: YES
+     Comment: Collection of identical MyISAM tables
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+*************************** 3. row ***************************
+      Engine: MyISAM
+     Support: DEFAULT
+     Comment: Default engine as of MySQL 3.23 with great performance
+Transactions: NO
+          XA: NO
+  Savepoints: NO
+...
+</programlisting>
+
+  <para>
     This chapter describes each of the MySQL storage engines except for
     <literal>NDBCLUSTER</literal>, which is covered in
     <xref linkend="refman-5.1:mysql-cluster"/>. It also contains a


Thread
svn commit - mysqldoc@docsrva: r13924 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0paul.dubois25 Feb