← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-02-11 20:01:37 UTC
  • mto: (1300.3.1 query-as-string)
  • mto: This revision was merged to the branch mainline in revision 1307.
  • Revision ID: osullivan.padraig@gmail.com-20100211200137-kx0nmgy8hke3snid
Updated the calls to dtrace probes to use the c_str() pointer from query in Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
5995
5995
  if (join->const_tables != join->tables)
5996
5996
  {
5997
5997
    optimize_keyuse(join, keyuse_array);
5998
 
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query, join->session->thread_id);
 
5998
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_START(join->session->query.c_str(), join->session->thread_id);
5999
5999
    bool res= choose_plan(join, all_table_map & ~join->const_table_map);
6000
6000
    DRIZZLE_QUERY_OPT_CHOOSE_PLAN_DONE(res ? 1 : 0);
6001
6001
    if (res)