bk commit into 5.0 tree (ramil:1.2030)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.2030 05/09/30 12:37:58 ramil@stripped +1 -0
  Comment adjusted (see fix for #13545)

  sql/sql_base.cc
    1.308 05/09/30 12:37:50 ramil@stripped +4 -5
    Comment adjusted (see fix for #13545)

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.307/sql/sql_base.cc	2005-09-29 19:34:14 +05:00
+++ 1.308/sql/sql_base.cc	2005-09-30 12:37:50 +05:00
@@ -2987,11 +2987,10 @@
     Check that the table and database that qualify the current field name
     are the same as the table reference we are going to search for the field.
 
-    We exclude from the test below NATURAL/USING joins and any nested join
-    because each column in such
-    joins may potentially originate from a different table. However, base
-    tables and views that are under some NATURAL/USING join are searched
-    as usual base tables/views.
+    Exclude from the test below nested joins because the columns in a
+    nested join generally originate from different tables. Nested joins
+    also have no table name, except when a nested join is a merge view
+    or an information schema table.
 
     We include explicitly table references with a 'field_translation' table,
     because if there are views over natural joins we don't want to search