bzr push into mysql-trunk branch (ole.john.aske:3880 to 3881) WL#5940

[Ole John Aske]

 3881 Ole John Aske	2012-04-27
      Added fix to pushed join JSON explain to WL#5940 branch

    modified:
      sql/opt_explain_json.cc
 3880 Ole John Aske	2012-04-25
      Updated WL#5940 with latest findings from main cluster branch (mysql-5.5-cluster-7.2)
      
      Only try to 'make_pushed_join()' if there are multiple tables in query.
            
      We want to keep a 'fast track' through the optimizer for simple, single table queries.
      Thus we should avoid possible overhead from finding join-pushable parts of the query
      if there are only a single table. 

    modified:
      sql/sql_optimizer.cc
=== modified file 'sql/opt_explain_json.cc'
--- a/sql/opt_explain_json.cc	2012-03-30 06:52:25 +0000
+++ b/sql/opt_explain_json.cc	2012-04-27 10:18:44 +0000
@@ -53,7 +53,7 @@ static const char *json_extra_tags[ET_to
   "const_row_not_found",                // ET_CONST_ROW_NOT_FOUND
   "unique_row_not_found",               // ET_UNIQUE_ROW_NOT_FOUND
   "impossible_on_condition",            // ET_IMPOSSIBLE_ON_CONDITION
-  NULL                                  // ET_PUSHED_JOIN
+  "pushed_join"                         // ET_PUSHED_JOIN
 };
 
 

No bundle (reason: useless for push emails).