bk commit into 5.0 tree (monty:1.1862)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1862 05/06/06 23:16:04 monty@stripped +1 -0
  Merge narttu:/my/mysql-5.0 into mysql.com:/my/mysql-5.0

  sql/sql_base.cc
    1.249 05/06/06 23:16:02 monty@stripped +0 -0
    Auto merged

# 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:	monty
# Host:	hasky.mysql.fi
# Root:	/my/mysql-5.0/RESYNC

--- 1.248/sql/sql_base.cc	2005-06-06 17:18:12 +03:00
+++ 1.249/sql/sql_base.cc	2005-06-06 23:16:02 +03:00
@@ -2096,7 +2096,7 @@
   SYNOPSIS
     open_normal_and_derived_tables
     thd		- thread handler
-    tables	- list of tables for open&locking
+    tables	- list of tables for open
 
   RETURN
     FALSE - ok