bk commit into 6.0-falcon tree (hakank:1.2549)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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@stripped, 2007-06-05 20:29:24+02:00, hakank@stripped +1 -0
  After merge fix.

  sql/sql_select.cc@stripped, 2007-06-05 20:29:20+02:00, hakank@stripped +1 -1
    After merge fix.

# 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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.533/sql/sql_select.cc	2007-06-05 16:46:27 +02:00
+++ 1.534/sql/sql_select.cc	2007-06-05 20:29:20 +02:00
@@ -15588,7 +15588,7 @@
           }
         }
         if (i > 0 && tab[-1].next_select == sub_select_cache)
-          extra.append(STRING_WITH_LEN("; Using join cache"));
+          extra.append(STRING_WITH_LEN("; Using join buffer"));
         
         /* Skip initial "; "*/
         const char *str= extra.ptr();