bk commit - mysqldoc tree (paul:1.2735)

[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.2735 05/03/16 13:59:22 paul@stripped +1 -0
  manual.texi:
    Update about ignorable coercibility.

  Docs/manual.texi
    1.2567 05/03/16 13:59:09 paul@stripped +6 -4
    Update about ignorable coercibility.

# 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:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.2566/Docs/manual.texi	2005-03-16 13:25:37 -06:00
+++ 1.2567/Docs/manual.texi	2005-03-16 13:59:09 -06:00
@@ -43435,6 +43435,8 @@
 
 @item A literal's collation has a coercibility of 4.
 
+@item @code{NULL} or an expression that is derived from @code{NULL} has a coercibility of
5.
+
 @end itemize
 
 The preceding coercibility values are current as of MySQL 4.1.11 and 5.0.3.
@@ -43476,9 +43478,9 @@
 
 @xref{Information functions}.
 
-Before MySQL 4.1.11 and 5.0.3, there is no system constant coercibility.
-Functions such as @code{USER()} have a coercibility of 2 rather than 3, and
-literals have a coercibility of 3 rather than 4.
+Before MySQL 4.1.11 and 5.0.3, there is no system constant or ignorable
+coercibility.  Functions such as @code{USER()} have a coercibility of 2
+rather than 3, and literals have a coercibility of 3 rather than 4.
 
 
 @node Charset-collation-charset, Charset-collation-effect, Charset-collate-tricky,
Charset-defaults
@@ -52494,7 +52496,7 @@
 @item @code{2} @tab Implicit collation @tab Column value
 @item @code{3} @tab System constant @tab @code{USER()} return value
 @item @code{4} @tab Coercible @tab Literal string
-@item @code{5} @tab Ignorable @tab @code{NULL}
+@item @code{5} @tab Ignorable @tab @code{NULL} or an expression derived from @code{NULL}
 @end multitable
 
 Before MySQL 4.1.11 and 5.0.3, the return values are shown as follows,