← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-01-15 03:08:27 UTC
  • mfrom: (1994.5.38 doc)
  • mto: This revision was merged to the branch mainline in revision 2087.
  • Revision ID: kalebral@gmail.com-20110115030827-0h9s99kiknrmt9ti
Merge Stewart - some documentation clean up

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
 
#include <drizzled/function/time/date.h>
23
 
#include <drizzled/temporal.h>
 
22
#include "drizzled/function/time/date.h"
 
23
#include "drizzled/temporal.h"
24
24
 
25
25
namespace drizzled
26
26
{
34
34
  if (! get_temporal(temporal))
35
35
    return (String *) NULL; /* get_temporal throws error. */
36
36
 
37
 
  if (str->alloc(type::Time::MAX_STRING_LENGTH))
 
37
  if (str->alloc(MAX_DATE_STRING_REP_LENGTH))
38
38
  {
39
39
    null_value= true;
40
40
    return (String *) NULL;
41
41
  }
42
42
 
43
43
  /* Convert the Date to a string and return it */
44
 
  size_t new_length;
45
 
  new_length= temporal.to_string(str->c_ptr(), type::Time::MAX_STRING_LENGTH);
46
 
  assert(new_length < type::Time::MAX_STRING_LENGTH);
 
44
  int new_length;
 
45
  new_length= temporal.to_string(str->c_ptr(), MAX_DATE_STRING_REP_LENGTH);
 
46
  assert(new_length < MAX_DATE_STRING_REP_LENGTH);
47
47
  str->length(new_length);
48
48
  return str;
49
49
}