← 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:20:19 UTC
  • mfrom: (1241.7.8 fix-dtrace-target)
  • Revision ID: brian@gaz-20091218232019-2eg8yvil821t08pr
MErge Padraig

Show diffs side-by-side

added added

removed removed

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