Author: paul
Date: 2007-09-06 03:25:16 +0200 (Thu, 06 Sep 2007)
New Revision: 7705
Log:
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-4.1/se-innodb.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/se-innodb.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-5.1/se-innodb.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.2/sql-syntax.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:24512
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:24515
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 122 bytes
Modified: trunk/refman-4.1/se-innodb.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 107 bytes
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 108 bytes
Modified: trunk/refman-5.0/se-innodb.xml
===================================================================
--- trunk/refman-5.0/se-innodb.xml 2007-09-05 21:22:59 UTC (rev 7704)
+++ trunk/refman-5.0/se-innodb.xml 2007-09-06 01:25:16 UTC (rev 7705)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 900 bytes
@@ -2274,9 +2274,9 @@
statement that displays output for the table
<literal>t</literal> and the auto-increment counter has not been
initialized, <literal>InnoDB</literal> initializes but does not
- increment the value and stores it for use by later inserts. This
- initialization uses a normal exclusive-locking read on the table
- and the lock lasts to the end of the transaction.
+ increment the value and stores it for use by later inserts.
+ This initialization uses a normal exclusive-locking read on
+ the table and the lock lasts to the end of the transaction.
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 108 bytes
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2007-09-05 21:22:59 UTC (rev 7704)
+++ trunk/refman-5.1/news-5.1.xml 2007-09-06 01:25:16 UTC (rev 7705)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 16; 1160 bytes
@@ -76,22 +76,7 @@
</para>
</listitem>
- <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>
</itemizedlist>
Modified: trunk/refman-5.1/se-innodb.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 107 bytes
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 108 bytes
Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 108 bytes
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7705 - in trunk: . dynamic-docs/command-optvars refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 6 Sep |
