← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 19:40:12 UTC
  • Revision ID: brian@tangent.org-20080731194012-oat11oy5vombrb1b
First pass of CHAR removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
789
789
    sql_field->unireg_check=Field::BLOB_FIELD;
790
790
    (*blob_columns)++;
791
791
    break;
 
792
  case DRIZZLE_TYPE_STRING:
 
793
    assert(0);
792
794
  case DRIZZLE_TYPE_VARCHAR:
793
 
  case DRIZZLE_TYPE_STRING:
794
795
    sql_field->pack_flag=0;
795
796
    if (sql_field->charset->state & MY_CS_BINSORT)
796
797
      sql_field->pack_flag|=FIELDFLAG_BINARY;
959
960
    */
960
961
    if (sql_field->def && 
961
962
        save_cs != sql_field->def->collation.collation &&
962
 
        (sql_field->sql_type == DRIZZLE_TYPE_STRING ||
963
 
         sql_field->sql_type == DRIZZLE_TYPE_SET ||
 
963
        (sql_field->sql_type == DRIZZLE_TYPE_SET ||
964
964
         sql_field->sql_type == DRIZZLE_TYPE_ENUM))
965
965
    {
966
966
      /*
1530
1530
      /* Use packed keys for long strings on the first column */
1531
1531
      if (!((*db_options) & HA_OPTION_NO_PACK_KEYS) &&
1532
1532
          (length >= KEY_DEFAULT_PACK_LENGTH &&
1533
 
           (sql_field->sql_type == DRIZZLE_TYPE_STRING ||
1534
 
            sql_field->sql_type == DRIZZLE_TYPE_VARCHAR ||
 
1533
           (sql_field->sql_type == DRIZZLE_TYPE_VARCHAR ||
1535
1534
            sql_field->pack_flag & FIELDFLAG_BLOB)))
1536
1535
      {
1537
1536
        if ((column_nr == 0 && (sql_field->pack_flag & FIELDFLAG_BLOB)) ||
4095
4094
  Field **f_ptr,*field;
4096
4095
  for (f_ptr=table->field ; (field= *f_ptr) ; f_ptr++)
4097
4096
    {
4098
 
    if (field->type() == DRIZZLE_TYPE_STRING)
4099
 
      create_info->varchar= true;
4100
4097
    /* Check if field should be dropped */
4101
4098
    Alter_drop *drop;
4102
4099
    drop_it.rewind();