← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2009-12-18 23:28:10 UTC
  • mfrom: (1240.7.8 explain-plan)
  • Revision ID: brian@gaz-20091218232810-8u72it1739fprbfm
Merge from Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
40
40
 
41
41
#include "drizzled/plugin/logging.h"
42
42
#include "drizzled/plugin/info_schema_table.h"
 
43
#include "drizzled/optimizer/explain_plan.h"
43
44
 
44
45
#include <bitset>
45
46
#include <algorithm>
538
539
      if (!(result= new select_send()))
539
540
        return true;
540
541
      session->send_explain_fields(result);
541
 
      res= mysql_explain_union(session, &session->lex->unit, result);
 
542
      optimizer::ExplainPlan planner;
 
543
      res= planner.explainUnion(session, &session->lex->unit, result);
542
544
      if (lex->describe & DESCRIBE_EXTENDED)
543
545
      {
544
546
        char buff[1024];