bzr push into mysql-next-mr-bugfixing branch (jorgen.loland:3247 to 3248)

[Jorgen Loland]

 3248 Jorgen Loland	2011-01-11
      WL4800 - review comment
      
      enum variable does not need a typename

    modified:
      sql/sql_select.cc
 3247 Jorgen Loland	2011-01-10
      WL#4800: Fix some review comments by Tor.
     @ sql/opt_trace.h
        Updating comments: EXECUTE is not traced anymore, it's the executed statement
        which is (one level below, in terms of stack frames...).

    modified:
      include/mysql/plugin.h
      sql/item_subselect.cc
      sql/opt_range.cc
      sql/opt_trace.h
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-10 14:55:06 +0000
+++ b/sql/sql_select.cc	2011-01-11 08:26:43 +0000
@@ -817,8 +817,7 @@ bool resolve_subquery(THD *thd, JOIN *jo
 {
   DBUG_ENTER("resolve_subquery");
 
-  enum subquery_type {SQ_NONE, SQ_SEMIJOIN, SQ_MATERIALIZATION};
-  subquery_type sq_choice= SQ_NONE;
+  enum {SQ_NONE, SQ_SEMIJOIN, SQ_MATERIALIZATION} sq_choice= SQ_NONE;
   bool types_problem= false; // if types prevented subq materialization
   SELECT_LEX *select_lex= join->select_lex;
 

No bundle (reason: useless for push emails).