← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Jay Pipes
  • Date: 2009-09-21 14:33:44 UTC
  • mfrom: (1126.10.26 dtrace-probes)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: jpipes@serialcoder-20090921143344-jnarp7gcn6zmg19c
Merge fixes from Trond and Padraig on dtrace probes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/year.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include "drizzled/server_includes.h"
 
21
#include CSTDINT_H
22
22
#include "drizzled/temporal.h"
23
23
#include "drizzled/error.h"
24
24
#include "drizzled/function/time/year.h"
25
25
 
26
 
namespace drizzled
27
 
{
28
 
 
29
26
int64_t Item_func_year::val_int()
30
27
{
31
28
  assert(fixed);
38
35
  }
39
36
 
40
37
  /* Grab the first argument as a DateTime object */
41
 
  DateTime temporal;
 
38
  drizzled::DateTime temporal;
42
39
  Item_result arg0_result_type= args[0]->result_type();
43
40
  
44
41
  switch (arg0_result_type)
103
100
  }
104
101
 
105
102
  /* Grab the first argument as a DateTime object */
106
 
  DateTime temporal;
 
103
  drizzled::DateTime temporal;
107
104
  
108
105
  if (! temporal.from_int64_t(args[0]->val_int()))
109
106
  {
130
127
  return (int64_t) temporal.years();
131
128
}
132
129
 
133
 
} /* namespace drizzled */