Author: mcbrown
Date: 2006-05-04 12:55:22 +0200 (Thu, 04 May 2006)
New Revision: 2024
Log:
Minor rewording for bug 18934
Modified:
trunk/refman-4.1/innodb.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.1/innodb.xml
trunk/refman-common/news-4.1.xml
trunk/refman-common/news-5.0.xml
trunk/refman-common/news-5.1.xml
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-05-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-4.1/innodb.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -2449,8 +2449,8 @@
</para>
<para>
- You cannot create a table with a name that matches the name of
- an internal InnoDB table (including
+ You cannot create a table with a column name that matches the
+ name of an internal InnoDB table (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
@@ -6039,8 +6039,8 @@
<literal>errno</literal> 150, table creation failed because
a foreign key constraint was not correctly formed. If the
error message refers to <literal>errno</literal> -1, table
- creation probably failued because the table name matched the
- name of an internal InnoDB table.
+ creation probably failed because the table included a column
+ name that matched the name of an internal InnoDB table.
</para>
</listitem>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-05-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-5.0/innodb.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -6069,8 +6069,8 @@
<literal>errno</literal> 150, table creation failed because
a foreign key constraint was not correctly formed. If the
error message refers to <literal>errno</literal> -1, table
- creation probably failued because the table name matched the
- name of an internal InnoDB table.
+ creation probably failed because the table included a column
+ name that matched the name of an internal InnoDB table.
</para>
</listitem>
@@ -7264,8 +7264,8 @@
<listitem>
<para>
- You cannot create a table with a name that matches the name of
- an internal InnoDB table (including
+ You cannot create a table with a column name that matches the
+ name of an internal InnoDB table (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-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-5.1/innodb.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -2458,12 +2458,12 @@
</para>
<para>
- You cannot create a table with a name that matches the name of
- an internal InnoDB table (including
+ You cannot create a table with a column name that matches the
+ name of an internal InnoDB table (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
- 5.1.10 this would cause a crash, since 5.1.101 the server will
+ 5.1.10 this would cause a crash, since 5.1.10 the server will
report error 1005 and refers to <literal>errno</literal> -1 in
the error message.
</para>
@@ -6028,8 +6028,8 @@
<literal>errno</literal> 150, table creation failed because
a foreign key constraint was not correctly formed. If the
error message refers to <literal>errno</literal> -1, table
- creation probably failued because the table name matched the
- name of an internal InnoDB table.
+ creation probably failed because the table includes a column
+ name that matched the name of an internal InnoDB table.
</para>
</listitem>
Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml 2006-05-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-common/news-4.1.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -226,8 +226,8 @@
<listitem>
<para>
- Creating a table in an InnoDB database that matched the name
- of an internal InnoDB table (including
+ Creating a table in an InnoDB database with a column name that
+ matched the name of an internal InnoDB table (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>) would cause a crash. MySQL now
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-05-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-common/news-5.0.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -381,8 +381,8 @@
<listitem>
<para>
- Creating a table in an InnoDB database that matched the name
- of an internal InnoDB table (including
+ Creating a table in an InnoDB database with a column name that
+ matched the name of an internal InnoDB table (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>) would cause a crash. MySQL now
Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml 2006-05-04 10:51:04 UTC (rev 2023)
+++ trunk/refman-common/news-5.1.xml 2006-05-04 10:55:22 UTC (rev 2024)
@@ -94,8 +94,8 @@
<listitem>
<para>
- Creating a table in an InnoDB database that matched the name
- of an internal InnoDB table (including
+ Creating a table in an InnoDB database with a column name that
+ matched the name of an internal InnoDB table (including
<literal>DB_ROW_ID</literal>, <literal>DB_TRX_ID</literal>,
<literal>DB_ROLL_PTR</literal> and
<literal>DB_MIX_ID</literal>) would cause a crash. MySQL now
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2024 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-common | mcbrown | 4 May |
