← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 06:48:39 UTC
  • mfrom: (2114.5.2 timestamp)
  • Revision ID: brian@tangent.org-20110126064839-nfcmqoqu08x22pdo
Merge in time tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
474
474
{
475
475
  do
476
476
  {
477
 
    if (result_type() == STRING_RESULT)
 
477
    if (is_null())
 
478
    {
 
479
      break;
 
480
    }
 
481
    else if (result_type() == STRING_RESULT)
478
482
    {
479
483
      char buff[40];
480
484
      String tmp(buff,sizeof(buff), &my_charset_bin),*res;
481
485
      if (!(res=val_str(&tmp)) ||
482
 
          str_to_datetime_with_warn(res->ptr(), res->length(),
 
486
          str_to_datetime_with_warn(current_session, res->ptr(), res->length(),
483
487
                                    &ltime, fuzzydate) <= type::DRIZZLE_TIMESTAMP_ERROR)
484
488
      {
485
489
        break;