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

[paul]

Author: paul
Date: 2007-09-06 03:34:22 +0200 (Thu, 06 Sep 2007)
New Revision: 7708

Log:
 r24619@frost:  paul | 2007-09-05 20:33:17 -0500
 Fix bad merge.


Modified:
   trunk/refman-5.1/news-5.1.xml

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


Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml	2007-09-06 01:27:18 UTC (rev 7707)
+++ trunk/refman-5.1/news-5.1.xml	2007-09-06 01:34:22 UTC (rev 7708)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 1; 1160 bytes

@@ -76,7 +76,22 @@
         </para>
       </listitem>
 
-    </itemizedlist>
+      <listitem>
+        <para>
+          If a <literal>MyISAM</literal> table is created with no
+          <literal>DATA DIRECTORY</literal> option, the
+          <filename>.MYD</filename> file is created in the database
+          directory. By default, if <literal>MyISAM</literal> finds an
+          existing <filename>.MYD</filename> file in this case, it
+          overwrites it. The same applies to <filename>.MYI</filename>
+          files for tables created with no <literal>INDEX
+          DIRECTORY</literal> option. To suppress this behavior, start
+          the server with the new
+          <option>--keep_files_on_create</option> option, in which case
+          <literal>MyISAM</literal> will not overwrite existing files
+          and returns an error instead. (Bug #29325)
+        </para>
+      </listitem>
 
     </itemizedlist>