← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merged from Toru - removal of my_time_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/curtime.cc
43
43
}
44
44
 
45
45
/**
46
 
    Converts current time in my_time_t to DRIZZLE_TIME represenatation for local
 
46
    Converts current time in time_t to DRIZZLE_TIME represenatation for local
47
47
    time zone. Defines time zone (local) used for whole CURTIME function.
48
48
*/
49
49
void Item_func_curtime_local::store_now_in_TIME(DRIZZLE_TIME *now_time)
50
50
{
51
51
  Session *session= current_session;
52
52
  session->variables.time_zone->gmt_sec_to_TIME(now_time,
53
 
                                             (my_time_t)session->query_start());
 
53
                                                (time_t)session->query_start());
54
54
}
55
55
 
56
56
/**
57
 
    Converts current time in my_time_t to DRIZZLE_TIME represenatation for UTC
 
57
    Converts current time in time_t to DRIZZLE_TIME represenatation for UTC
58
58
    time zone. Defines time zone (UTC) used for whole UTC_TIME function.
59
59
*/
60
60
void Item_func_curtime_utc::store_now_in_TIME(DRIZZLE_TIME *now_time)
61
61
{
62
62
  my_tz_UTC->gmt_sec_to_TIME(now_time,
63
 
                             (my_time_t)(current_session->query_start()));
 
63
                             (time_t)(current_session->query_start()));
64
64
  /*
65
65
    We are not flagging this query as using time zone, since it uses fixed
66
66
    UTC-SYSTEM time-zone.