Author: paul
Date: 2006-07-07 18:09:00 +0200 (Fri, 07 Jul 2006)
New Revision: 2677
Log:
r11156@polar: paul | 2006-07-07 10:42:38 -0500
Fix typos.
Modified:
trunk/
trunk/internals/internals.xml
trunk/refman-4.1/connector-j.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/connector-j.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/language-structure.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-common/news-4.1.xml
trunk/refman-common/news-5.0.xml
trunk/refman-common/news-5.1.xml
trunk/refman-common/news-connector-j.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11141
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11967
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11156
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11967
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/internals/internals.xml
===================================================================
--- trunk/internals/internals.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/internals/internals.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -16046,7 +16046,7 @@
fron the index file. These are the number of columns of the
table and the length of each column. The latter is required for
columns with suppressed leading spaces or suppressed trailing
- spaces or zeroes.
+ spaces or zeros.
</para>
</section>
@@ -16058,7 +16058,7 @@
<para>
As already mentioned, <command>myisampack</command> uses some
tricks to decrease the amount of data to be encoded. These cope
- with leading and trailing spaces or zeroes or with all blank or
+ with leading and trailing spaces or zeros or with all blank or
<literal>NULL</literal> fields.
</para>
@@ -16093,7 +16093,7 @@
2 byte number of code trees
1 byte maximum number of bytes required to represent record+blob lengths
1 byte number of bytes required to represent the compressed data file length
-4 byte zeroes
+4 byte zeros
</programlisting>
<para>
@@ -16165,7 +16165,7 @@
1 bit 1 = spaces only, 0 = not only spaces
In case the filed type is of:
FIELD_SKIP_ZERO
- 1 bit 1 = zeroes only, 0 = not only zeroes
+ 1 bit 1 = zeros only, 0 = not only zeros
In the latter case
x bits the Huffman code for every byte
FIELD_NORMAL
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-4.1/connector-j.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2610,7 +2610,7 @@
<row>
<entry>zeroDateTimeBehavior</entry>
<entry>What should happen when the driver encounters DATETIME values that are
- composed entirely of zeroes (used by MySQL to
+ composed entirely of zeros (used by MySQL to
represent invalid dates)? Valid values are
'exception', 'round' and 'convertToNull'.</entry>
<entry>exception</entry>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-4.1/data-types.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2125,7 +2125,7 @@
<para>
When used in conjunction with the optional extension attribute
<literal>ZEROFILL</literal>, the default padding of spaces is
- replaced with zeroes. For example, for a column declared as
+ replaced with zeros. For example, for a column declared as
<literal>INT(5) ZEROFILL</literal>, a value of
<literal>4</literal> is retrieved as <literal>00004</literal>.
Note that if you store larger values than the display width in an
@@ -2737,7 +2737,7 @@
<literal>YYMMDD</literal> or <literal>YYMMDDHHMMSS</literal>
format and that the year is given by the first 2 digits. Numbers
that are not one of these lengths are interpreted as though
- padded with leading zeroes to the closest length.
+ padded with leading zeros to the closest length.
</para>
<indexterm>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-4.1/database-administration.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -17581,7 +17581,7 @@
programs such as <command>ps</command> that may be invoked
by other users to display command lines. MySQL clients
typically overwrite the command-line password argument with
- zeroes during their initialization sequence. However, there
+ zeros during their initialization sequence. However, there
is still a brief interval during which the value is visible.
On some systems this strategy is ineffective, anyway, and
the password remains visible to <command>ps</command>.
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.0/connector-j.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2610,7 +2610,7 @@
<row>
<entry>zeroDateTimeBehavior</entry>
<entry>What should happen when the driver encounters DATETIME values that are
- composed entirely of zeroes (used by MySQL to
+ composed entirely of zeros (used by MySQL to
represent invalid dates)? Valid values are
'exception', 'round' and 'convertToNull'.</entry>
<entry>exception</entry>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.0/data-types.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2229,7 +2229,7 @@
<para>
When used in conjunction with the optional extension attribute
<literal>ZEROFILL</literal>, the default padding of spaces is
- replaced with zeroes. For example, for a column declared as
+ replaced with zeros. For example, for a column declared as
<literal>INT(5) ZEROFILL</literal>, a value of
<literal>4</literal> is retrieved as <literal>00004</literal>.
Note that if you store larger values than the display width in an
@@ -2419,7 +2419,7 @@
To specify bit values,
<literal>b'<replaceable>value</replaceable>'</literal> notation
can be used. <replaceable>value</replaceable> is a binary value
- written using zeroes and ones. For example,
+ written using zeros and ones. For example,
<literal>b'111'</literal> and <literal>b'100000000'</literal>
represent 7 and 128, respectively. See
<xref linkend="bit-field-values"/>.
@@ -2429,7 +2429,7 @@
If you assign a value to a
<literal>BIT(<replaceable>M</replaceable>)</literal> column that
is less than <replaceable>M</replaceable> bits long, the value is
- padded on the left with zeroes. For example, assigning a value of
+ padded on the left with zeros. For example, assigning a value of
<literal>b'101'</literal> to a <literal>BIT(6)</literal> column
is, in effect, the same as assigning <literal>b'000101'</literal>.
</para>
@@ -2864,7 +2864,7 @@
<literal>YYMMDD</literal> or <literal>YYMMDDHHMMSS</literal>
format and that the year is given by the first 2 digits. Numbers
that are not one of these lengths are interpreted as though
- padded with leading zeroes to the closest length.
+ padded with leading zeros to the closest length.
</para>
<indexterm>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.0/database-administration.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -20445,7 +20445,7 @@
programs such as <command>ps</command> that may be invoked
by other users to display command lines. MySQL clients
typically overwrite the command-line password argument with
- zeroes during their initialization sequence. However, there
+ zeros during their initialization sequence. However, there
is still a brief interval during which the value is visible.
On some systems this strategy is ineffective, anyway, and
the password remains visible to <command>ps</command>.
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.0/language-structure.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -707,7 +707,7 @@
Beginning with MySQL 5.0.3, bit-field values can be written
using <literal>b'<replaceable>value</replaceable>'</literal>
notation. <replaceable>value</replaceable> is a binary value
- written using zeroes and ones.
+ written using zeros and ones.
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.0/sql-syntax.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -220,7 +220,7 @@
TABLE</literal> ignores the <literal>DATA DIRECTORY</literal>
and <literal>INDEX DIRECTORY</literal> table options.)
<xref linkend="create-table"/>, lists all table options. As of
- MySQL 5.0.23, to prevent inadvertant loss of data,
+ MySQL 5.0.23, to prevent inadvertent loss of data,
<literal>ALTER TABLE</literal> cannot be used to change the
storage engine of a table to <literal>MERGE</literal> or
<literal>BLACKHOLE</literal>.
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.1/connector-j.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2610,7 +2610,7 @@
<row>
<entry>zeroDateTimeBehavior</entry>
<entry>What should happen when the driver encounters DATETIME values that are
- composed entirely of zeroes (used by MySQL to
+ composed entirely of zeros (used by MySQL to
represent invalid dates)? Valid values are
'exception', 'round' and 'convertToNull'.</entry>
<entry>exception</entry>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.1/data-types.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -2119,7 +2119,7 @@
<para>
When used in conjunction with the optional extension attribute
<literal>ZEROFILL</literal>, the default padding of spaces is
- replaced with zeroes. For example, for a column declared as
+ replaced with zeros. For example, for a column declared as
<literal>INT(5) ZEROFILL</literal>, a value of
<literal>4</literal> is retrieved as <literal>00004</literal>.
Note that if you store larger values than the display width in an
@@ -2298,7 +2298,7 @@
To specify bit values,
<literal>b'<replaceable>value</replaceable>'</literal> notation
can be used. <replaceable>value</replaceable> is a binary value
- written using zeroes and ones. For example,
+ written using zeros and ones. For example,
<literal>b'111'</literal> and <literal>b'100000000'</literal>
represent 7 and 128, respectively. See
<xref linkend="bit-field-values"/>.
@@ -2308,7 +2308,7 @@
If you assign a value to a
<literal>BIT(<replaceable>M</replaceable>)</literal> column that
is less than <replaceable>M</replaceable> bits long, the value is
- padded on the left with zeroes. For example, assigning a value of
+ padded on the left with zeros. For example, assigning a value of
<literal>b'101'</literal> to a <literal>BIT(6)</literal> column
is, in effect, the same as assigning <literal>b'000101'</literal>.
</para>
@@ -2741,7 +2741,7 @@
<literal>YYMMDD</literal> or <literal>YYMMDDHHMMSS</literal>
format and that the year is given by the first 2 digits. Numbers
that are not one of these lengths are interpreted as though
- padded with leading zeroes to the closest length.
+ padded with leading zeros to the closest length.
</para>
<indexterm>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.1/database-administration.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -20542,7 +20542,7 @@
programs such as <command>ps</command> that may be invoked
by other users to display command lines. MySQL clients
typically overwrite the command-line password argument with
- zeroes during their initialization sequence. However, there
+ zeros during their initialization sequence. However, there
is still a brief interval during which the value is visible.
On some systems this strategy is ineffective, anyway, and
the password remains visible to <command>ps</command>.
Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.1/language-structure.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -707,7 +707,7 @@
Bit-field values can be written using
<literal>b'<replaceable>value</replaceable>'</literal> notation.
<replaceable>value</replaceable> is a binary value written using
- zeroes and ones.
+ zeros and ones.
</para>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-5.1/sql-syntax.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -240,7 +240,7 @@
TABLE</literal> ignores the <literal>DATA DIRECTORY</literal>
and <literal>INDEX DIRECTORY</literal> table options.)
<xref linkend="create-table"/>, lists all table options. As of
- MySQL 5.1.11, to prevent inadvertant loss of data,
+ MySQL 5.1.11, to prevent inadvertent loss of data,
<literal>ALTER TABLE</literal> cannot be used to change the
storage engine of a table to <literal>MERGE</literal> or
<literal>BLACKHOLE</literal>.
Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-common/news-4.1.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -278,7 +278,7 @@
<listitem>
<para>
- The omission of leading zeroes in dates could lead to
+ The omission of leading zeros in dates could lead to
erroneous results when these were compared with the output of
certain date and time functions. (Bug #16377)
</para>
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-common/news-5.0.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -216,16 +216,16 @@
restored from a cluster backup. (Bug #20820)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: When attempting to restart the
cluster following a data import, the cluster would fail during
Phase 4 of the restart with <errortext>Error 2334: Job buffer
- congestion</errortext>. (Bug #20774)
+ congestion</errortext>. (Bug #20774)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: A node failure during a scan
@@ -233,15 +233,15 @@
quickly following the failure. (Bug #20197)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: It was possible to use port
numbers greater than 65535 for <literal>ServerPort</literal>
- in the <filename>config.ini</filename> file. (Bug #19164)
+ in the <filename>config.ini</filename> file. (Bug #19164)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: Under certain circumstances, a
@@ -503,7 +503,7 @@
<listitem>
<para>
- To prevent inadvertant loss of data, <literal>ALTER
+ To prevent inadvertent loss of data, <literal>ALTER
TABLE</literal> can no longer be used to change the storage
engine of a table to <literal>MERGE</literal> or
<literal>BLACKHOLE</literal>. (Bug #10952)
@@ -564,9 +564,9 @@
<listitem>
<para>
- Re-execution of a multiple-table <literal>DELETE</literal>
- statement that involves a trigger or stored function can
- result in a server crash. (Bug #19636)
+ Re-execution of a prepared multiple-table
+ <literal>DELETE</literal> statement that involves a trigger or
+ stored function can result in a server crash. (Bug #19634)
</para>
</listitem>
@@ -609,7 +609,7 @@
<listitem>
<para>
- The omission of leading zeroes in dates could lead to
+ The omission of leading zeros in dates could lead to
erroneous results when these were compared with the output of
certain date and time functions. (Bug #16377)
</para>
@@ -664,7 +664,7 @@
<para>
<literal>NDB Cluster</literal>: <literal>TEXT</literal>
columns in Cluster tables having both an explicit primary key
- and a unque key were not correctly updated by
+ and a unique key were not correctly updated by
<literal>REPLACE</literal> statements. (Bug #19906)
</para>
</listitem>
@@ -13211,7 +13211,7 @@
<listitem>
<para>
Fixed a bug in division of floating point numbers. It could
- cause nine zeroes (<literal>000000000</literal>) to be
+ cause nine zeros (<literal>000000000</literal>) to be
inserted in the middle of the quotient. (Bug #9501)
</para>
</listitem>
Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-common/news-5.1.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -335,9 +335,9 @@
<listitem>
<para>
- Re-execution of a multiple-table <literal>DELETE</literal>
- statement that involves a trigger or stored function can
- result in a server crash. (Bug #19636)
+ Re-execution of a prepared multiple-table
+ <literal>DELETE</literal> statement that involves a trigger or
+ stored function can result in a server crash. (Bug #19634)
</para>
</listitem>
@@ -383,7 +383,7 @@
<listitem>
<para>
- The omission of leading zeroes in dates could lead to
+ The omission of leading zeros in dates could lead to
erroneous results when these were compared with the output of
certain date and time functions. (Bug #16377)
</para>
@@ -423,10 +423,10 @@
<literal>NDB Cluster</literal>: When attempting to restart the
cluster following a data import, the cluster would fail during
Phase 4 of the restart with <errortext>Error 2334: Job buffer
- congestion</errortext>. (Bug #20774)
+ congestion</errortext>. (Bug #20774)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: A node failure during a scan
@@ -434,15 +434,15 @@
quickly following the failure. (Bug #20197)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal>: It was possible to use port
numbers greater than 65535 for <literal>ServerPort</literal>
- in the <filename>config.ini</filename> file. (Bug #19164)
+ in the <filename>config.ini</filename> file. (Bug #19164)
</para>
</listitem>
-
+
<listitem>
<para>
<literal>NDB Cluster</literal> (Replication): In some cases, a
@@ -590,7 +590,7 @@
<para>
<literal>NDB Cluster</literal>: <literal>TEXT</literal>
columns in Cluster tables having both an explicit primary key
- and a unque key were not correctly updated by
+ and a unique key were not correctly updated by
<literal>REPLACE</literal> statements. (Bug #19906)
</para>
</listitem>
@@ -1559,7 +1559,7 @@
<listitem>
<para>
- To prevent inadvertant loss of data, <literal>ALTER
+ To prevent inadvertent loss of data, <literal>ALTER
TABLE</literal> can no longer be used to change the storage
engine of a table to <literal>MERGE</literal> or
<literal>BLACKHOLE</literal>. (Bug #10952)
@@ -5236,7 +5236,7 @@
<listitem>
<para>
All subpartitions within a given partitioned table are now
- guaranteed to have unque names. (Bug #15408)
+ guaranteed to have unique names. (Bug #15408)
</para>
</listitem>
Modified: trunk/refman-common/news-connector-j.xml
===================================================================
--- trunk/refman-common/news-connector-j.xml 2006-07-07 12:31:28 UTC (rev 2676)
+++ trunk/refman-common/news-connector-j.xml 2006-07-07 16:09:00 UTC (rev 2677)
@@ -5619,7 +5619,7 @@
<para>
<literal>ResultSet.getDate/Time/Timestamp</literal> now
recognizes all forms of invalid values that have been set to
- all zeroes by MySQL (SF bug 586058).
+ all zeros by MySQL (SF bug 586058).
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2677 - in trunk: . internals refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 7 Jul |
