← 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-04-17 02:05:51 UTC
  • mfrom: (2279.1.3 build)
  • Revision ID: kalebral@gmail.com-20110417020551-59m0hx1p10b0up1x
Merge Joe - 760367: DATA_DICTIONARY.CUMULATIVE_USER_STATS.CONNECTED_TIME_SEC reports bogus results
Merge Olaf - Refactor Catalog Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date.cc
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))
38
 
  {
39
 
    null_value= true;
40
 
    return (String *) NULL;
41
 
  }
 
37
  str->alloc(type::Time::MAX_STRING_LENGTH);
42
38
 
43
39
  /* Convert the Date to a string and return it */
44
40
  size_t new_length;