← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.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/sql_parse.cc
220
220
  {
221
221
    if (! session->readAndStoreQuery(packet, packet_length))
222
222
      break;                                    // fatal error is set
223
 
    DRIZZLE_QUERY_START(session->query,
 
223
    DRIZZLE_QUERY_START(session->query.c_str(),
224
224
                        session->thread_id,
225
225
                        const_cast<const char *>(session->db.empty() ? "" : session->db.c_str()));
226
226
 
754
754
    {
755
755
      if (! session->is_error())
756
756
      {
757
 
        DRIZZLE_QUERY_EXEC_START(session->query,
 
757
        DRIZZLE_QUERY_EXEC_START(session->query.c_str(),
758
758
                                 session->thread_id,
759
759
                                 const_cast<const char *>(session->db.empty() ? "" : session->db.c_str()));
760
760
        /* Actually execute the query */
1773
1773
{
1774
1774
  assert(session->m_lip == NULL);
1775
1775
 
1776
 
  DRIZZLE_QUERY_PARSE_START(session->query);
 
1776
  DRIZZLE_QUERY_PARSE_START(session->query.c_str());
1777
1777
 
1778
1778
  /* Set Lex_input_stream. */
1779
1779