← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge refactored command line using for innodb

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/dayofyear.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
21
 
#include <drizzled/temporal.h>
22
 
#include <drizzled/error.h>
23
 
#include <drizzled/calendar.h>
24
 
#include <drizzled/function/time/dayofyear.h>
25
 
#include <drizzled/internal/my_sys.h>
 
20
#include "config.h"
 
21
#include "drizzled/temporal.h"
 
22
#include "drizzled/error.h"
 
23
#include "drizzled/calendar.h"
 
24
#include "drizzled/function/time/dayofyear.h"
 
25
#include "drizzled/internal/my_sys.h"
26
26
 
27
27
namespace drizzled
28
28
{
58
58
        char buff[DRIZZLE_MAX_LENGTH_DATETIME_AS_STRING];
59
59
        String tmp(buff,sizeof(buff), &my_charset_utf8_bin);
60
60
        String *res= args[0]->val_str(&tmp);
61
 
 
62
 
        if (res && (res != &tmp))
63
 
        {
64
 
          tmp.copy(*res);
65
 
        }
66
 
 
67
 
        if (! temporal.from_string(tmp.c_ptr(), tmp.length()))
 
61
        if (! temporal.from_string(res->c_ptr(), res->length()))
68
62
        {
69
63
          /* 
70
64
          * Could not interpret the function argument as a temporal value, 
71
65
          * so throw an error and return 0
72
66
          */
73
 
          my_error(ER_INVALID_DATETIME_VALUE, MYF(0), tmp.c_ptr());
 
67
          my_error(ER_INVALID_DATETIME_VALUE, MYF(0), res->c_ptr());
74
68
          return 0;
75
69
        }
76
70
      }
92
86
 
93
87
        res= args[0]->val_str(&tmp);
94
88
 
95
 
        if (res && (res != &tmp))
96
 
        {
97
 
          tmp.copy(*res);
98
 
        }
99
 
 
100
 
        my_error(ER_INVALID_DATETIME_VALUE, MYF(0), tmp.c_ptr());
 
89
        my_error(ER_INVALID_DATETIME_VALUE, MYF(0), res->c_ptr());
101
90
        return 0;
102
91
      }
103
92
  }