← Back to branch summary

~xnox/ubuntu/saucy/drizzle/merge

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-01-01 13:55:03 UTC
  • Revision ID: james.westby@ubuntu.com-20110101135503-x2ub1akxoisgwi6z
Tags: 2010.12.06-0ubuntu4
* Fixed missing build depends.
* Added Lee to uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/from_unixtime.cc
41
41
 
42
42
String *Item_func_from_unixtime::val_str(String *str)
43
43
{
44
 
  DRIZZLE_TIME time_tmp;
 
44
  type::Time time_tmp;
45
45
 
46
46
  assert(fixed == 1);
47
47
 
61
61
 
62
62
int64_t Item_func_from_unixtime::val_int()
63
63
{
64
 
  DRIZZLE_TIME time_tmp;
 
64
  type::Time time_tmp;
65
65
 
66
66
  assert(fixed == 1);
67
67
 
71
71
  return (int64_t) TIME_to_uint64_t_datetime(&time_tmp);
72
72
}
73
73
 
74
 
bool Item_func_from_unixtime::get_date(DRIZZLE_TIME *ltime, uint32_t)
 
74
bool Item_func_from_unixtime::get_date(type::Time *ltime, uint32_t)
75
75
{
76
76
  uint64_t tmp= (uint64_t)(args[0]->val_int());
77
77
  /*