← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Jay Pipes
  • Date: 2009-09-21 14:33:44 UTC
  • mfrom: (1126.10.26 dtrace-probes)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: jpipes@serialcoder-20090921143344-jnarp7gcn6zmg19c
Merge fixes from Trond and Padraig on dtrace probes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
210
210
      break;                                    // fatal error is set
211
211
    DRIZZLE_QUERY_START(session->query,
212
212
                        session->thread_id,
213
 
                        (char *) (session->db ? session->db : ""));
 
213
                        const_cast<const char *>(session->db ? session->db : ""));
214
214
    const char* end_of_stmt= NULL;
215
215
 
216
216
    mysql_parse(session, session->query, session->query_length, &end_of_stmt);
778
778
            session->query_length--;
779
779
          DRIZZLE_QUERY_EXEC_START(session->query,
780
780
                                   session->thread_id,
781
 
                                   (char *) (session->db ? session->db : ""));
 
781
                                   const_cast<const char *>(session->db ? session->db : ""));
782
782
          /* Actually execute the query */
783
783
          mysql_execute_command(session);
784
784
          DRIZZLE_QUERY_EXEC_DONE(0);