bk commit - mysqldoc tree (paul:1.2904)

[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.2904 05/04/26 20:49:12 paul@stripped +1 -0
  manual.texi:
    Add note about character set used by LOAD DATA.
    Document bugfix. (Bug #7806)

  Docs/manual.texi
    1.2759 05/04/26 20:48:51 paul@stripped +5 -0
    Add note about character set used by LOAD DATA.

  Docs/manual.texi
    1.2758 05/04/26 20:43:09 paul@stripped +5 -0
    Document bugfix. (Bug #7806)

# 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.2757/Docs/manual.texi	2005-04-26 20:35:39 -05:00
+++ 1.2759/Docs/manual.texi	2005-04-26 20:48:51 -05:00
@@ -55166,6 +55166,11 @@
 @code{LOAD DATA INFILE} and speeding up @code{LOAD DATA INFILE},
 @ref{Insert speed}.
 
+As of MySQL 4.1, the character set indicated by the
+@code{character_set_database} system variable is used to interpret the
+information in the file.  @code{SET NAMES} and the setting of
+@code{character_set_client} do not affect input interpretation.
+
 @cindex @command{mysqlimport}
 You can also load data files by using the @command{mysqlimport} utility; it
 operates by sending a @code{LOAD DATA INFILE} statement to the server.  The
@@ -100850,6 +100855,11 @@
 @strong{Security fix:} If @command{mysqld} was started with
 @code{--user=@var{non_existent_user}}, it would run using the privileges of the
 account it was invoked from, even if that was @code{root}.  (Bug #9833)
+@item
+@code{INSERT ... ON DUPLICATE KEY UPDATE} incorrectly updated a
+@code{TIMESTAMP} column to the current timestamp, even if the update list
+included @code{@var{col_name} = @var{col_name}} for that column to prevent
+the update.  (Bug #7806)
 @item
 Starting @command{mysqld} with the @code{--skip-innodb} and
 @code{--default-storage-engine=innodb} (or @code{--default-table-type=innodb}