Author: paul
Date: 2006-05-10 21:00:45 +0200 (Wed, 10 May 2006)
New Revision: 2072
Log:
r7411@polar: paul | 2006-05-10 13:12:44 -0500
Amend changelog-related content.
Modified:
trunk/
trunk/refman-4.1/innodb.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.1/innodb.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7410
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10279
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7411
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10279
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-05-10 19:00:07 UTC (rev 2071)
+++ trunk/refman-4.1/innodb.xml 2006-05-10 19:00:45 UTC (rev 2072)
@@ -2450,7 +2450,7 @@
<para>
You cannot create a table with a column name that matches the
- name of an internal InnoDB table (including
+ name of an internal InnoDB column (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>). In versions of MySQL before
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-05-10 19:00:07 UTC (rev 2071)
+++ trunk/refman-5.0/innodb.xml 2006-05-10 19:00:45 UTC (rev 2072)
@@ -7265,7 +7265,7 @@
<listitem>
<para>
You cannot create a table with a column name that matches the
- name of an internal InnoDB table (including
+ name of an internal InnoDB column (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>). In versions of MySQL before
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-05-10 19:00:07 UTC (rev 2071)
+++ trunk/refman-5.1/innodb.xml 2006-05-10 19:00:45 UTC (rev 2072)
@@ -2459,7 +2459,7 @@
<para>
You cannot create a table with a column name that matches the
- name of an internal InnoDB table (including
+ name of an internal InnoDB column (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>). In versions of MySQL before
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2072 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 May |
