← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/unix_timestamp.cc
63
63
  if (! temporal.is_valid())
64
64
  {
65
65
    null_value= true;
66
 
    char buff[MAX_DATETIME_WIDTH];
67
 
    size_t buff_len;
68
 
    temporal.to_string(buff, &buff_len);
69
 
    buff[buff_len]= '\0';
 
66
    char buff[drizzled::DateTime::MAX_STRING_LENGTH];
 
67
    int buff_len;
 
68
    buff_len= temporal.to_string(buff, drizzled::DateTime::MAX_STRING_LENGTH);
 
69
    assert((buff_len+1) < drizzled::DateTime::MAX_STRING_LENGTH);
70
70
    my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(0), buff);
71
71
    return 0;
72
72
  }