← 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: 2008-07-28 03:45:43 UTC
  • mfrom: (212.1.8 codestyle)
  • Revision ID: brian@tangent.org-20080728034543-qulvxdig8powjsj1
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
595
595
        push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 
596
596
                            ER_WARN_TOO_FEW_RECORDS, 
597
597
                            ER(ER_WARN_TOO_FEW_RECORDS), thd->row_count);
598
 
        if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
 
598
        if (!field->maybe_null() && field->type() == DRIZZLE_TYPE_TIMESTAMP)
599
599
            ((Field_timestamp*) field)->set_time();
600
600
      }
601
601
      else
711
711
          field->set_null();
712
712
          if (!field->maybe_null())
713
713
          {
714
 
            if (field->type() == MYSQL_TYPE_TIMESTAMP)
 
714
            if (field->type() == DRIZZLE_TYPE_TIMESTAMP)
715
715
              ((Field_timestamp*) field)->set_time();
716
716
            else if (field != table->next_number_field)
717
717
              field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
776
776
                     thd->row_count);
777
777
            return(1);
778
778
          }
779
 
          if (!field->maybe_null() && field->type() == FIELD_TYPE_TIMESTAMP)
 
779
          if (!field->maybe_null() && field->type() == DRIZZLE_TYPE_TIMESTAMP)
780
780
              ((Field_timestamp*) field)->set_time();
781
781
          /*
782
782
            QQ: We probably should not throw warning for each field.
894
894
            table->auto_increment_field_not_null= true;
895
895
          if (!field->maybe_null())
896
896
          {
897
 
            if (field->type() == FIELD_TYPE_TIMESTAMP)
 
897
            if (field->type() == DRIZZLE_TYPE_TIMESTAMP)
898
898
              ((Field_timestamp *) field)->set_time();
899
899
            else if (field != table->next_number_field)
900
900
              field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,