bk commit into 5.0 tree (monty:1.1945)

[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.1945 05/09/13 12:39:58 monty@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/my/mysql-5.0

  sql/sql_parse.cc
    1.474 05/09/13 12:39:52 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.473/sql/sql_parse.cc	2005-09-12 12:27:47 +03:00
+++ 1.474/sql/sql_parse.cc	2005-09-13 12:39:52 +03:00
@@ -6360,7 +6360,7 @@
   SYNOPSIS
     make_join_on_context()
     thd       pointer to current thread
-    left_op   lefto operand of the JOIN
+    left_op   left  operand of the JOIN
     right_op  rigth operand of the JOIN
 
   DESCRIPTION