From: Jorgen Loland
Date: September 22 2011 6:55am
Subject: bzr push into mysql-trunk branch (jorgen.loland:3437 to 3438)
List-Archive: http://lists.mysql.com/commits/141074
Message-Id: <20110922065524.36D49130@atum21.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3438 Jorgen Loland	2011-09-22
      Cleanup in the optimizer: postpush fix
       * "maybe_ref" removed from join_type_str[] used by explain

    modified:
      sql/sql_select.cc
 3437 Jorgen Loland	2011-09-20
      Cleanup in the optimizer: 
       * Rename JT_NEXT to JT_INDEX_SCAN
       * Remove JT_MAYBE_REF (unused)
       * Document what the join_type names mean

    modified:
      sql/opt_explain.cc
      sql/sql_select.cc
      sql/sql_select.h
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-09-20 13:07:55 +0000
+++ b/sql/sql_select.cc	2011-09-22 06:53:05 +0000
@@ -54,7 +54,7 @@
 #define PREV_BITS(type,A)	((type) (((type) 1 << (A)) -1))
 
 const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
-			      "MAYBE_REF","ALL","range","index","fulltext",
+			      "ALL","range","index","fulltext",
 			      "ref_or_null","unique_subquery","index_subquery",
                               "index_merge"
 };

No bundle (reason: useless for push emails).