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

[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.3670 05/10/06 12:16:03 paul@stripped +2 -0
  xmlformat.conf:
    trivial change.
  news-5.0.xml:
    Revise changelog entry.

  tools/xmlformat.conf
    1.17 05/10/06 12:15:46 paul@stripped +2 -0
    trivial change.

  refman-common/news-5.0.xml
    1.265 05/10/06 12:02:44 paul@stripped +2 -3
    Revise changelog entry.

# 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:	/Users/paul/bk/mysqldoc

--- 1.16/tools/xmlformat.conf	2005-09-07 11:57:27 -05:00
+++ 1.17/tools/xmlformat.conf	2005-10-06 12:15:46 -05:00
@@ -103,3 +103,5 @@
     exit-break  1
     element-break   1
     normalize       yes
+
+

--- 1.264/refman-common/news-5.0.xml	2005-10-06 10:36:28 -05:00
+++ 1.265/refman-common/news-5.0.xml	2005-10-06 12:02:44 -05:00
@@ -376,9 +376,8 @@
 
       <listitem>
         <para>
-          With <literal>LOCK TABLES</literal> in effect, when
-          <literal>SELECT ... FOR UPDATE</literal> or <literal>SELECT
-          ... LOCK IN SHARE MODE</literal> for an
+          When <literal>SELECT ... FOR UPDATE</literal> or
+          <literal>SELECT ... LOCK IN SHARE MODE</literal> for an
           <literal>InnoDB</literal> table were executed from within a
           stored function or a trigger, they were converted to a
           non-locking consistent read. (Bug #11238)