← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_query/logging_query.cc

  • Committer: Brian Aker
  • Date: 2009-08-17 22:19:53 UTC
  • mto: This revision was merged to the branch mainline in revision 1118.
  • Revision ID: brian@gaz-20090817221953-6qzdxpi8l9nd342y
More dead option removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_query/logging_query.cc
18
18
 */
19
19
 
20
20
#include <drizzled/server_includes.h>
21
 
#include <drizzled/plugin/logging.h>
 
21
#include <drizzled/plugin/logging_handler.h>
22
22
#include <drizzled/gettext.h>
23
23
#include <drizzled/session.h>
24
24
#include PCRE_HEADER
165
165
}
166
166
 
167
167
 
168
 
class Logging_query: public drizzled::plugin::Logging
 
168
class Logging_query: public Logging_handler
169
169
{
170
170
  int fd;
171
171
  pcre *re;
173
173
 
174
174
public:
175
175
 
176
 
  Logging_query()
177
 
    : drizzled::plugin::Logging("Logging_query"),
178
 
      fd(-1), re(NULL), pe(NULL)
 
176
  Logging_query() : Logging_handler("Logging_query"), fd(-1), re(NULL), pe(NULL)
179
177
  {
180
178
 
181
179
    /* if there is no destination filename, dont bother doing anything */
287
285
      snprintf(msgbuf, MAX_MSG_LEN,
288
286
               "%"PRIu64",%"PRIu64",%"PRIu64",\"%.*s\",\"%s\",\"%.*s\","
289
287
               "%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
290
 
               "%"PRIu32",%"PRIu32",%"PRIu32",\"%s\",%"PRIu32"\n",
 
288
               "%"PRIu32",%"PRIu32"\n",
291
289
               t_mark,
292
290
               session->thread_id,
293
 
               session->getQueryId(),
 
291
               session->query_id,
294
292
               // dont need to quote the db name, always CSV safe
295
293
               dbl, dbs,
296
294
               // do need to quote the query
297
 
               quotify((unsigned char *)session->getQueryString(),
298
 
                       session->getQueryLength(), qs, sizeof(qs)),
 
295
               quotify((unsigned char *)session->query,
 
296
                       session->query_length, qs, sizeof(qs)),
299
297
               // command_name is defined in drizzled/sql_parse.cc
300
298
               // dont need to quote the command name, always CSV safe
301
299
               (int)command_name[session->command].length,
307
305
               session->sent_row_count,
308
306
               session->examined_row_count,
309
307
               session->tmp_table,
310
 
               session->total_warn_count,
311
 
               session->getServerId(),
312
 
               glob_hostname,
313
 
               drizzled_tcp_port
314
 
               );
 
308
               session->total_warn_count);
315
309
  
316
310
    // a single write has a kernel thread lock, thus no need mutex guard this
317
311
    wrv= write(fd, msgbuf, msgbuf_len);