bk commit - mysqldoc tree (paul:1.2734)

[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.2734 05/03/16 13:26:12 paul@stripped +1 -0
  manual.texi:
    Document bugfix. (Bug #9129)
    Revise COERCIBILITY() return values.
    Document bugfix. (Bug #8785)
    Document bugfix. (Bug #8489)

  Docs/manual.texi
    1.2566 05/03/16 13:25:37 paul@stripped +23 -4
    Document bugfix. (Bug #9129)
    Revise COERCIBILITY() return values.

  Docs/manual.texi
    1.2565 05/03/16 12:52:45 paul@stripped +3 -0
    Document bugfix. (Bug #8785)

  Docs/manual.texi
    1.2564 05/03/16 12:32:23 paul@stripped +4 -0
    Document bugfix. (Bug #8489)

# 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.2563/Docs/manual.texi	2005-03-16 11:48:56 -06:00
+++ 1.2566/Docs/manual.texi	2005-03-16 13:25:37 -06:00
@@ -52494,14 +52494,23 @@
 @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}
+@end multitable
+
+Before MySQL 4.1.11 and 5.0.3, the return values are shown as follows,
+and functions such as @code{USER()} have a coercibility of 2:
+
+@multitable @columnfractions .15 .15 .70
+@item @strong{Coercibility} @tab @strong{Meaning} @tab @strong{Example}
+@item @code{0} @tab Explicit collation @tab Value with @code{COLLATE} clause
+@item @code{1} @tab No collation @tab Concatenation of strings with different collations
+@item @code{2} @tab Implicit collation @tab Column value
+@item @code{3} @tab Coercible @tab Literal string
 @end multitable
 
 Lower values have higher precedence.
 
-@code{COERCIBILITY()} was added in MySQL 4.1.1.  Before MYSQL 4.1.11 and
-5.0.3, the system constant coercibility value is not present: Functions such
-as @code{USER()} have a coercibility of 2, and literal strings have a
-coercibility of 3 rather than 4.
+@code{COERCIBILITY()} was added in MySQL 4.1.1.
 
 @c description_for_help_topic COLLATION
 @findex COLLATION()
@@ -98462,6 +98471,23 @@
 
 Bugs fixed:
 @itemize @bullet
+@item
+The @code{CHARSET()}, @code{COLLATION()}, and @code{COERCIBILITY()} functions
+sometimes returned @code{NULL}.  @code{CHARSET()} and @code{COLLATION()}
+returned @code{NULL} when given any of these arguments that evaluated
+to @code{NULL}: A system function such as @code{DATABASE()}; a column
+value; and a user variable.  Now @code{CHARSET()} and @code{COLLATION()}
+return the system character set and collation; the column character set
+and collation; and @code{binary}.  @code{COERCIBILITY(NULL)} now returns
+``ignorable'' coercibility rather than @code{NULL}.
+(Bug #9129)
+@item
+Expressions involving nested @code{CONCAT()} calls and character set
+conversion of string constants could return an incorrect result. (Bug #8785)
+@item
+The @code{MEMORY} storage engine did not properly increment an
+@code{AUTO_INCREMENT} column if there was a second composite index that
+included the column.  (Bug #8489)
 @item
 Fixed a bug in the filesort routine such that killing a filesort could cause
 an assertion failure. (Bug #8799)