List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:January 25 2011 10:18am
Subject:[Resend] bzr commit into mysql-next-mr-bugfixing branch
(guilhem.bichot:3264)
View as plain text  
[This commit e-mail is a repeat.]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on
revid:guilhem.bichot@stripped

 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
=== 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)
   {


Attachment: [text/bzr-bundle] bzr/guilhem.bichot@oracle.com-20110125100605-phj929pxpwm4jwsj.bundle
Thread
[Resend] bzr commit into mysql-next-mr-bugfixing branch(guilhem.bichot:3264) Guilhem Bichot25 Jan