bk commit - mysqldoc@docsrva tree (paul:1.2634)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2634 05/05/06 17:11:39 paul@stripped +1 -0
  manual.texi:
    Miscellaneous cleanups.

  Docs/manual.texi
    1.2812 05/05/06 17:11:20 paul@stripped +24 -23
    Miscellaneous cleanups.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.2811/Docs/manual.texi	2005-05-06 16:45:32 -05:00
+++ 1.2812/Docs/manual.texi	2005-05-06 17:11:20 -05:00
@@ -10723,15 +10723,15 @@
 @itemize @bullet
 
 @item
-@code{DECIMAL} columns are now stored in a more efficient format.
+@code{DECIMAL} columns now are stored in a more efficient format.
 To convert a table to use the new @code{DECIMAL} type, you should do an
-@code{ALTER TABLE} on it. The @code{ALTER TABLE} will also change all your
+@code{ALTER TABLE} on it. The @code{ALTER TABLE} also will change the table's
 @code{VARCHAR} columns to use the new @code{VARCHAR} column type.
 For information about possible incompatibilities with old applications,
 see @ref{precision math}.
 
 @item
-MySQL 5.0.3 now uses precision math when calculating with @code{DECIMAL}
+MySQL 5.0.3 and up uses precision math when calculating with @code{DECIMAL}
 values (64 decimal digits) and for rounding exact-value numbers.
 @xref{precision math}.
 
@@ -44375,9 +44375,9 @@
 @code{CONVERT(... USING ...)} is implemented according to the standard SQL
 specification.
 
-If you in @code{traditional} mode convert a zero date string to a date
-@code{CONVERT()} will return NULL. MySQL 5.0.4 and above will also produce
-a warning.
+In @code{TRADITIONAL} SQL mode, if you convert a ``zero'' date string to a
+date, @code{CONVERT()} returns @code{NULL}. MySQL 5.0.4 and above also
+produces a warning.
 
 @node Charset-CAST, Charset-SHOW, Charset-CONVERT, Charset-operations
 @subsection @code{CAST()}
@@ -44412,9 +44412,9 @@
 SELECT CAST(_latin1'test' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin;
 @end example
 
-If you in @code{traditional} mode cast a zero date string to a date
-@code{CAST()} will return NULL. MySQL 5.0.4 and above will also produce
-a warning.
+In @code{TRADITIONAL} SQL mode, if you convert a ``zero'' date string to a
+date, @code{CAST()} returns @code{NULL}. MySQL 5.0.4 and above also
+produces a warning.
 
 @node Charset-SHOW,  , Charset-CAST, Charset-operations
 @subsection @code{SHOW} Statements
@@ -49144,9 +49144,9 @@
 @var{str3}, @code{...} list.
 Returns @code{0} if @var{str} is not found.
 
-If all arguments to FIELD() are strings, then all arguments are compared
-as strings. If all arguments are numbers then they are compared as
-numbers.  Otherwise the arguments are compared as double.
+If all arguments to @code{FIELD()} are strings, all arguments are compared
+as strings. If all arguments are numbers, they are compared as
+numbers.  Otherwise, the arguments are compared as double.
 
 If @var{str} is @code{NULL}, the return value is @code{0} because
 @code{NULL} fails equality comparison with any value.
@@ -58318,13 +58318,13 @@
 
 @item
 @code{IGNORE} is a MySQL extension to standard SQL.
-It controls how @code{ALTER TABLE} works if there are duplicates on
-unique keys in the new table or if one got warnings during @code{STRICT} mode.
-If @code{IGNORE} isn't specified, the copy is aborted and rolled back if
-duplicate-key errors occur.
-If @code{IGNORE} is specified, then for rows with duplicates on a unique
-key, only the first row is used. The others conflicting rows are deleted.
-Wrong values are truncated to the closest matching acceptable value.
+It controls how @code{ALTER TABLE} works if there are duplicates on unique
+keys in the new table or if warnings occur when @code{STRICT} mode is
+enabled.  If @code{IGNORE} isn't specified, the copy is aborted and rolled
+back if duplicate-key errors occur.  If @code{IGNORE} is specified, then for
+rows with duplicates on a unique key, only the first row is used. The others
+conflicting rows are deleted.  Wrong values are truncated to the closest
+matching acceptable value.
 
 @item
 You can issue multiple @code{ADD}, @code{ALTER}, @code{DROP}, and
@@ -100182,14 +100182,15 @@
 Fixed a problem with the @code{tee} command in @command{mysql} that resulted
 in @command{mysql} crashing.  (Bug #8499)
 @item
-@code{CAST()} now produces warnings when casting a wrong @code{INTEGER}
-and @code{CHAR} values. This also applies to implicite @code{string} to
+@code{CAST()} now produces warnings when casting incorrect @code{INTEGER}
+and @code{CHAR} values. This also applies to implicit @code{string} to
 @code{number} casts. (Bug #5912)
 @item
-@code{ALTER TABLE} now fails in @code{STRICT} mode if generates warnings.
+@code{ALTER TABLE} now fails in @code{STRICT} mode if the alteration generates
+warnings.
 @item
 Using @code{CONVERT('0000-00-00',date)} or @code{CAST('0000-00-00' as date)}
-in @code{TRADITIONAL} mode now produces a warning. (Bug #6145)
+in @code{TRADITIONAL} SQL mode now produces a warning. (Bug #6145)
 @item
 Inserting a zero date in a @code{DATE}, @code{DATETIME} or @code{TIMESTAMP}
 column during @code{TRADITIONAL} mode now produces an error. (Bug #5933)