← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Lee Bieber
  • Date: 2010-11-16 17:50:17 UTC
  • mfrom: (1932.3.2 trunk)
  • Revision ID: kalebral@gmail.com-20101116175017-sken3dkkpfcd2snv
Merge Brian - session fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
5868
5868
  if (join->const_tables != join->tables)
5869
5869
  {
5870
5870
    optimize_keyuse(join, keyuse_array);
5871
 
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query.c_str(), join->session->thread_id);
 
5871
    // @note c_str() is not likely to be valid here if dtrace expects it to
 
5872
    // exist for any period of time.
 
5873
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->getQueryString()->c_str(), join->session->thread_id);
5872
5874
    bool res= choose_plan(join, all_table_map & ~join->const_table_map);
5873
5875
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_DONE(res ? 1 : 0);
5874
5876
    if (res)