← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_gearman/logging_gearman.cc

  • Committer: kaaveeacs
  • Date: 2011-04-14 19:30:10 UTC
  • mfrom: (2278 staging)
  • mto: This revision was merged to the branch mainline in revision 2290.
  • Revision ID: kaaveeacs@gmail.com-20110414193010-70xh9v0c2txi25r8
Merge coding style fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_gearman/logging_gearman.cc
25
25
#include <drizzled/plugin/logging.h>
26
26
#include <drizzled/gettext.h>
27
27
#include <drizzled/session.h>
 
28
#include <drizzled/session/times.h>
28
29
#include <drizzled/sql_parse.h>
29
30
#include <drizzled/errmsg_print.h>
30
31
#include <boost/date_time.hpp>
39
40
#include <cerrno>
40
41
#include <memory>
41
42
 
42
 
 
43
 
namespace drizzle_plugin
44
 
{
 
43
namespace drizzle_plugin {
45
44
 
46
45
namespace po= boost::program_options;
47
46
 
230
229
      inside itself, so be more accurate, and so this doesnt have to
231
230
      keep calling current_utime, which can be slow.
232
231
    */
233
 
    uint64_t t_mark= session->getCurrentTimestamp(false);
 
232
    uint64_t t_mark= session->times.getCurrentTimestamp(false);
234
233
  
235
234
 
236
235
    // buffer to quotify the query
237
236
    unsigned char qs[255];
238
237
  
239
238
    // to avoid trying to printf %s something that is potentially NULL
240
 
    drizzled::util::string::const_shared_ptr dbs(session->schema());
 
239
    drizzled::util::string::ptr dbs(session->schema());
241
240
  
242
241
    msgbuf_len=
243
242
      snprintf(msgbuf.get(), MAX_MSG_LEN,
256
255
               (int)drizzled::getCommandName(session->command).size(),
257
256
               drizzled::getCommandName(session->command).c_str(),
258
257
               // counters are at end, to make it easier to add more
259
 
               (t_mark - session->getConnectMicroseconds()),
260
 
               (session->getElapsedTime()),
261
 
               (t_mark - session->utime_after_lock),
 
258
               (t_mark - session->times.getConnectMicroseconds()),
 
259
               (session->times.getElapsedTime()),
 
260
               (t_mark - session->times.utime_after_lock),
262
261
               session->sent_row_count,
263
262
               session->examined_row_count,
264
263
               session->tmp_table,