← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/now.cc

  • Committer: Lee Bieber
  • Date: 2011-04-13 18:54:56 UTC
  • mfrom: (2275.1.2 build)
  • Revision ID: kalebral@gmail.com-20110413185456-ygv8a7lxf92ttoee
Merge Joe - 755201: slave plugin queryForReplicationEvents() query needs to be ordered
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/now.cc
22
22
#include <drizzled/function/time/now.h>
23
23
#include <drizzled/current_session.h>
24
24
#include <drizzled/session.h>
 
25
#include <drizzled/session/times.h>
25
26
#include <drizzled/temporal.h>
26
27
#include <drizzled/field.h>
27
28
 
63
64
{
64
65
  Session *session= current_session;
65
66
  uint32_t fractional_seconds= 0;
66
 
  time_t tmp= session->getCurrentTimestampEpoch(fractional_seconds);
 
67
  time_t tmp= session->times.getCurrentTimestampEpoch(fractional_seconds);
67
68
 
68
69
#if 0
69
70
  now_time->store(tmp, fractional_seconds, true);
78
79
*/
79
80
void Item_func_now_utc::store_now_in_TIME(type::Time &now_time)
80
81
{
81
 
  Session *session= current_session;
82
82
  uint32_t fractional_seconds= 0;
83
 
  time_t tmp= session->getCurrentTimestampEpoch(fractional_seconds);
84
 
 
 
83
  time_t tmp= current_session->times.getCurrentTimestampEpoch(fractional_seconds);
85
84
  now_time.store(tmp, fractional_seconds);
86
85
}
87
86