Author: paul
Date: 2007-06-01 21:32:06 +0200 (Fri, 01 Jun 2007)
New Revision: 6625
Log:
r20853@frost: paul | 2007-06-01 14:29:41 -0500
Revert previous change re: ALTER TABLE and NO_ENGINE_SUBSTITUTION.
I do not fully understand the issue yet.
Modified:
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:25520
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20849
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:25520
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20853
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-06-01 18:42:00 UTC (rev 6624)
+++ trunk/refman-5.0/dba-core.xml 2007-06-01 19:32:06 UTC (rev 6625)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 4; 858 bytes
@@ -10987,10 +10987,9 @@
<para>
Prevent automatic substitution of the default storage
engine when a statement such as <literal>CREATE
- TABLE</literal> or <literal>ALTER TABLE</literal>
- specifies a storage engine that is disabled or not
- compiled in. An error occurs instead. (Implemented in
- MySQL 5.0.8)
+ TABLE</literal> specifies a storage engine that is
+ disabled or not compiled in. An error occurs instead.
+ (Implemented in MySQL 5.0.8)
</para>
</listitem>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-06-01 18:42:00 UTC (rev 6624)
+++ trunk/refman-5.0/sql-syntax.xml 2007-06-01 19:32:06 UTC (rev 6625)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 8; 886 bytes
@@ -333,14 +333,6 @@
</programlisting>
<para>
- If the storage engine is unavailable (for example, it is
- disabled or not compiled in), a warning is generated and the
- default storage engine is used. To prevent this substitution
- and cause an error to occur instead, set the
- <literal>NO_ENGINE_SUBSTITUTION</literal> SQL mode.
- </para>
-
- <para>
As of MySQL 5.0.23, to prevent inadvertent loss of data,
<literal>ALTER TABLE</literal> cannot be used to change the
storage engine of a table to <literal>MERGE</literal> or
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-06-01 18:42:00 UTC (rev 6624)
+++ trunk/refman-5.1/dba-core.xml 2007-06-01 19:32:06 UTC (rev 6625)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 771 bytes
@@ -11235,9 +11235,8 @@
<para>
Prevent automatic substitution of the default storage
engine when a statement such as <literal>CREATE
- TABLE</literal> or <literal>ALTER TABLE</literal>
- specifies a storage engine that is disabled or not
- compiled in. An error occurs instead.
+ TABLE</literal> specifies a storage engine that is
+ disabled or not compiled in. An error occurs instead.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-06-01 18:42:00 UTC (rev 6624)
+++ trunk/refman-5.1/sql-syntax.xml 2007-06-01 19:32:06 UTC (rev 6625)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 8; 886 bytes
@@ -374,14 +374,6 @@
</programlisting>
<para>
- If the storage engine is unavailable (for example, it is
- disabled or not compiled in), a warning is generated and the
- default storage engine is used. To prevent this substitution
- and cause an error to occur instead, set the
- <literal>NO_ENGINE_SUBSTITUTION</literal> SQL mode.
- </para>
-
- <para>
As of MySQL 5.1.11, to prevent inadvertent loss of data,
<literal>ALTER TABLE</literal> cannot be used to change the
storage engine of a table to <literal>MERGE</literal> or
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r6625 - in trunk: . refman-5.0 refman-5.1 | paul | 1 Jun |
