← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 05:13:04 UTC
  • mfrom: (240 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731051304-a9kawbozru3fic1g
Merged from trunk.

Show diffs side-by-side

added added

removed removed

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