Author: paul
Date: 2008-12-17 14:00:47 +0100 (Wed, 17 Dec 2008)
New Revision: 12964
Log:
r36883@frost: paul | 2008-12-17 06:51:47 -0500
We used both both non-existent and nonexistent. Pick one.
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-5.0/faqs.xml
trunk/refman-5.1/faqs.xml
trunk/refman-6.0/faqs.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36877
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36883
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-17 00:15:11 UTC (rev 12963)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-17 13:00:47 UTC (rev 12964)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1664 bytes
@@ -363,7 +363,7 @@
fail if the specified tablespace does not already exist,
returning a error indicating general table creation failure. The
message has been updated to indicate that the failure is due to
- nonexistent tablespace.
+ non-existent tablespace.
</para>
</message>
@@ -3043,7 +3043,7 @@
<para>
An <literal>ALTER TABLE ... TABLESPACE</literal> statement
- referencing a nonexistant tablespace on a
+ referencing a non-existant tablespace on a
<literal>Falcon</literal> table failed with an inappropriate
error message the first time it was executed. A second attempt
to execute the statement led to a crash of the MySQL server.
@@ -6700,7 +6700,7 @@
<message>
<para>
- Attempting to pass a nonexistent column name to the
+ Attempting to pass a non-existent column name to the
<literal>equal()</literal> and
<literal>setValue()</literal>
methods of <literal>NdbOperation</literal> caused NDB API
applications to crash. Now the column name is checked, and an
@@ -37178,7 +37178,7 @@
<para>
<literal role="stmt">BACKUP DATABASE</literal> produced an
incorrect error message when the backup image filename contained
- a nonexistent directory.
+ a non-existent directory.
</para>
</message>
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-12-17 00:15:11 UTC (rev 12963)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-12-17 13:00:47 UTC (rev 12964)
Changed blocks: 11, Lines Added: 12, Lines Deleted: 12; 3771 bytes
@@ -25825,7 +25825,7 @@
<para>
<command>ndb_mgm</command> could hang when connecting to a
- nonexistent host.
+ non-existent host.
</para>
</message>
@@ -69206,7 +69206,7 @@
<para>
<literal>InnoDB</literal> wrongly reported in the
<filename>.err</filename> log that MySQL wass trying to drop a
- nonexistent table, if no more room remained in the tablespace.
+ non-existent table, if no more room remained in the tablespace.
</para>
</message>
@@ -73816,7 +73816,7 @@
<message>
<para>
- Trying to insert a value into a nonexistent
+ Trying to insert a value into a non-existent
<literal>LIST</literal> partition of an
<literal>NDB</literal>
table would cause the server to crash.
</para>
@@ -81230,7 +81230,7 @@
<para>
The <literal>NdbOperation::getBlobHandle()</literal> method,
- when called with the name of a nonexistent column, caused a
+ when called with the name of a non-existent column, caused a
segmentation fault.
</para>
@@ -81407,7 +81407,7 @@
<message>
<para>
- (NDBAPI): Passing a nonexistent index name to
+ (NDBAPI): Passing a non-existent index name to
<literal>NdbIndexScanOperation::setBound()</literal> caused a
segmentation fault.
</para>
@@ -83809,7 +83809,7 @@
<para>
When a stored routine attempted to execute a statement accessing
- a nonexistent table, the error was not caught by the routine's
+ a non-existent table, the error was not caught by the routine's
exception handler.
</para>
@@ -103131,7 +103131,7 @@
<message>
<para>
- (NDB API): Attempting to read a nonexistent tuple using
+ (NDB API): Attempting to read a non-existent tuple using
<literal>Commit</literal> mode for
<literal>NdbTransaction::execute()</literal> caused node
failures.
@@ -110910,8 +110910,8 @@
<message>
<para>
- Trying to create a Disk Data table using a nonexistent
- tablespace or to drop a nonexistent data file from a tablespace
+ Trying to create a Disk Data table using a non-existent
+ tablespace or to drop a non-existent data file from a tablespace
produced an uninformative error message.
</para>
@@ -116785,7 +116785,7 @@
<para>
It was possible to execute a statement for creating a Disk Data
- table that referred to a nonexistent tablespace, in which case
+ table that referred to a non-existent tablespace, in which case
the table created was actually an in-memory
<literal>NDB</literal> table. Such a statement now fails
instead, with an appropriate error message.
@@ -129456,7 +129456,7 @@
<message>
<para>
- For a nonexistent table, <literal>DROP TEMPORARY TABLE</literal>
+ For a non-existent table, <literal>DROP TEMPORARY TABLE</literal>
failed with an incorrect error message if
<literal role="sysvar">read_only</literal> was enabled.
</para>
@@ -129729,7 +129729,7 @@
<para>
After defining a delete operation (using
- <literal>NdbOperation::deleteTuple()</literal>) on a nonexistent
+ <literal>NdbOperation::deleteTuple()</literal>) on a non-existent
primary key of a table having a
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> column, invoking
Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml 2008-12-17 00:15:11 UTC (rev 12963)
+++ trunk/refman-5.0/faqs.xml 2008-12-17 13:00:47 UTC (rev 12964)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 588 bytes
@@ -6290,7 +6290,7 @@
<para>
This is one reason why MySQL cannot allow encodings of
- nonexistent characters. If it is not strict about rejecting
+ non-existent characters. If it is not strict about rejecting
bad input, then it has no way of knowing where characters
end.
</para>
Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml 2008-12-17 00:15:11 UTC (rev 12963)
+++ trunk/refman-5.1/faqs.xml 2008-12-17 13:00:47 UTC (rev 12964)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 588 bytes
@@ -6357,7 +6357,7 @@
<para>
This is one reason why MySQL cannot allow encodings of
- nonexistent characters. If it is not strict about rejecting
+ non-existent characters. If it is not strict about rejecting
bad input, then it has no way of knowing where characters
end.
</para>
Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml 2008-12-17 00:15:11 UTC (rev 12963)
+++ trunk/refman-6.0/faqs.xml 2008-12-17 13:00:47 UTC (rev 12964)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 588 bytes
@@ -4561,7 +4561,7 @@
<para>
This is one reason why MySQL cannot allow encodings of
- nonexistent characters. If it is not strict about rejecting
+ non-existent characters. If it is not strict about rejecting
bad input, then it has no way of knowing where characters
end.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12964 - in trunk: . dynamic-docs/changelog refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 17 Dec |