← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_query/logging_query.cc

Merge with my query rewrite tree to change the query member in Session to std::string

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_query/logging_query.cc
276
276
    if (re)
277
277
    {
278
278
      int this_pcre_rc;
279
 
      this_pcre_rc = pcre_exec(re, pe, session->query, session->query_length, 0, 0, NULL, 0);
 
279
      this_pcre_rc = pcre_exec(re, pe, session->query.c_str(), session->query.length(), 0, 0, NULL, 0);
280
280
      if (this_pcre_rc < 0)
281
281
        return false;
282
282
    }
298
298
               // dont need to quote the db name, always CSV safe
299
299
               (int)session->db.length(), dbs,
300
300
               // do need to quote the query
301
 
               quotify((unsigned char *)session->getQueryString(),
 
301
               quotify((unsigned char *)session->getQueryString().c_str(),
302
302
                       session->getQueryLength(), qs, sizeof(qs)),
303
303
               // command_name is defined in drizzled/sql_parse.cc
304
304
               // dont need to quote the command name, always CSV safe