← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2011-01-08 10:35:13 UTC
  • mfrom: (2057.2.9 timestamp)
  • Revision ID: brian@tangent.org-20110108103513-3wuo8tsyajjcxjrg
Merge in fractional seconds to timestamp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
485
485
                            ER_WARN_TOO_FEW_RECORDS,
486
486
                            ER(ER_WARN_TOO_FEW_RECORDS), session->row_count);
487
487
 
488
 
        if (!field->maybe_null() && field->type() == DRIZZLE_TYPE_TIMESTAMP)
 
488
        if (not field->maybe_null() and field->is_timestamp())
489
489
            ((field::Epoch::pointer) field)->set_time();
490
490
      }
491
491
      else
602
602
            return(1);
603
603
          }
604
604
          field->set_null();
605
 
          if (!field->maybe_null())
 
605
          if (not field->maybe_null())
606
606
          {
607
 
            if (field->type() == DRIZZLE_TYPE_TIMESTAMP)
 
607
            if (field->is_timestamp())
608
608
            {
609
609
              ((field::Epoch::pointer) field)->set_time();
610
610
            }
672
672
                     session->row_count);
673
673
            return(1);
674
674
          }
675
 
          if (!field->maybe_null() && field->type() == DRIZZLE_TYPE_TIMESTAMP)
 
675
          if (not field->maybe_null() and field->is_timestamp())
676
676
              ((field::Epoch::pointer) field)->set_time();
677
677
          /*
678
678
            QQ: We probably should not throw warning for each field.