bzr push into mysql-next-mr-bugfixing branch (guilhem.bichot:3263 to 3264)

[Guilhem Bichot]

 3264 Guilhem Bichot	2011-01-25
      Now that QUICK*::dbug_dump() don't write to the trace anymore,
      TEST_join() doesn't anymore, making this disabler unneeded.

    modified:
      sql/sql_select.cc
 3263 Guilhem Bichot	2011-01-21
      show traces in optimizer_trace2.test. Implies to have one version in normal mode
      and one version in ps-protocol mode, due to IN->EXISTS (which is done
      when preparing the statement).

    added:
      mysql-test/r/optimizer_trace2_ps_prot.result
      mysql-test/t/optimizer_trace2_no_prot.test
      mysql-test/t/optimizer_trace2_ps_prot.test
    renamed:
      mysql-test/r/optimizer_trace2.result => mysql-test/r/optimizer_trace2_no_prot.result
      mysql-test/t/optimizer_trace2.test => mysql-test/include/optimizer_trace2.inc
    modified:
      mysql-test/r/optimizer_trace2_no_prot.result
      mysql-test/include/optimizer_trace2.inc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-01-21 15:11:00 +0000
+++ b/sql/sql_select.cc	2011-01-25 10:06:05 +0000
@@ -2467,11 +2467,7 @@ JOIN::optimize()
     for (uint i = const_tables; i < tables; i++)
       join_tab[i].table->prepare_for_position();
   }
-  DBUG_EXECUTE("info",
-               {
-                 Opt_trace_disable_I_S otd(trace, true);
-                 TEST_join(this);
-               });
+  DBUG_EXECUTE("info", TEST_join(this););
 
   if (const_tables != tables)
   {

No bundle (reason: useless for push emails).