← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
643
643
 
644
644
    if (sql_field->sql_type == DRIZZLE_TYPE_ENUM)
645
645
    {
646
 
      uint32_t dummy;
 
646
      size_t dummy;
647
647
      const CHARSET_INFO * const cs= sql_field->charset;
648
648
      TYPELIB *interval= sql_field->interval;
649
649
 
676
676
          if (String::needs_conversion(tmp->length(), tmp->charset(),
677
677
                                       cs, &dummy))
678
678
          {
679
 
            uint32_t cnv_errs;
 
679
            size_t cnv_errs;
680
680
            conv.copy(tmp->ptr(), tmp->length(), tmp->charset(), cs, &cnv_errs);
681
681
            interval->type_names[i]= session->mem_root->strmake_root(conv.ptr(), conv.length());
682
682
            interval->type_lengths[i]= conv.length();
718
718
            }
719
719
          }
720
720
        }
721
 
        calculate_interval_lengths(cs, interval, &field_length, &dummy);
 
721
        uint32_t new_dummy;
 
722
        calculate_interval_lengths(cs, interval, &field_length, &new_dummy);
722
723
        sql_field->length= field_length;
723
724
      }
724
725
      set_if_smaller(sql_field->length, (uint32_t)MAX_FIELD_WIDTH-1);