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

[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.2642 05/05/09 12:04:23 paul@stripped +1 -0
  manual.texi:
    Point out explicitly that LOCK TABLES can block.

  Docs/manual.texi
    1.2830 05/05/09 12:03:57 paul@stripped +6 -5
    Point out explicitly that LOCK TABLES can block.

# 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.2829/Docs/manual.texi	2005-05-09 04:57:00 -05:00
+++ 1.2830/Docs/manual.texi	2005-05-09 12:03:57 -05:00
@@ -60274,11 +60274,12 @@
 @end example
 
 @c description_for_help_topic LOCK  LOCK UNLOCK TABLES AS READ LOCAL LOW_PRIORITY WRITE
-@code{LOCK TABLES} locks tables for the current thread.  @code{UNLOCK
-TABLES} releases any locks held by the current thread.  All tables that
-are locked by the current thread are implicitly unlocked when the
-thread issues another @code{LOCK TABLES}, or when the connection to the
-server is closed.
+@code{LOCK TABLES} locks tables for the current thread.  If any of the tables
+are locked by other threads, it blocks until all locks can be acquired.
+@code{UNLOCK TABLES} releases any locks held by the current thread.
+All tables that are locked by the current thread are implicitly unlocked
+when the thread issues another @code{LOCK TABLES}, or when the connection
+to the server is closed.
 @c end_description_for_help_topic
 
 Note the following regarding the use of @code{LOCK TABLES} with transactional