← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 02:36:20 UTC
  • Revision ID: brian@tangent.org-20080731023620-enizjsjaw5perm78
Removed old/dead VARCHAR type from pre-5.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
10586
10586
    new_field->flags|= (org_field->flags & NO_DEFAULT_VALUE_FLAG);
10587
10587
    if (org_field->maybe_null() || (item && item->maybe_null))
10588
10588
      new_field->flags&= ~NOT_NULL_FLAG;        // Because of outer join
10589
 
    if (org_field->type() == DRIZZLE_TYPE_VAR_STRING ||
10590
 
        org_field->type() == DRIZZLE_TYPE_VARCHAR)
 
10589
    if (org_field->type() == DRIZZLE_TYPE_VARCHAR)
10591
10590
      table->s->db_create_options|= HA_OPTION_PACK_RECORD;
10592
10591
    else if (org_field->type() == DRIZZLE_TYPE_DOUBLE)
10593
10592
      ((Field_double *) new_field)->not_fixed= true;
16491
16490
      enum_field_types type;
16492
16491
      if ((type= field->type()) == DRIZZLE_TYPE_BLOB)
16493
16492
        key_length+=MAX_BLOB_WIDTH;             // Can't be used as a key
16494
 
      else if (type == DRIZZLE_TYPE_VARCHAR || type == DRIZZLE_TYPE_VAR_STRING)
 
16493
      else if (type == DRIZZLE_TYPE_VARCHAR)
16495
16494
        key_length+= field->field_length + HA_KEY_BLOB_LENGTH;
16496
16495
      else
16497
16496
        key_length+= field->pack_length();