← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Monty Taylor
  • Date: 2009-05-08 19:07:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090508190739-rwas5y9xjg1a92p6
Reverted a crap-ton of padraig's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
823
823
   key_start(0), part_of_key(0), part_of_key_not_clustered(0),
824
824
   part_of_sortkey(0), unireg_check(unireg_check_arg),
825
825
   field_length(length_arg), null_bit(null_bit_arg),
826
 
   is_created_from_null_item(false)
 
826
   is_created_from_null_item(false),
 
827
   is_stored(true)
827
828
{
828
829
  flags=null_ptr ? 0: NOT_NULL_FLAG;
829
830
  comment.str= (char*) "";
1181
1182
  if (tmp->table->maybe_null)
1182
1183
    tmp->flags&= ~NOT_NULL_FLAG;
1183
1184
  tmp->table= new_table;
1184
 
  tmp->key_start.reset();
1185
 
  tmp->part_of_key.reset();
1186
 
  tmp->part_of_sortkey.reset();
 
1185
  tmp->key_start.init(0);
 
1186
  tmp->part_of_key.init(0);
 
1187
  tmp->part_of_sortkey.init(0);
1187
1188
  tmp->unireg_check= Field::NONE;
1188
1189
  tmp->flags&= (NOT_NULL_FLAG | BLOB_FLAG | UNSIGNED_FLAG | BINARY_FLAG | ENUM_FLAG | SET_FLAG);
1189
1190
  tmp->reset_fields();
1317
1318
              ((decimals_arg & FIELDFLAG_MAX_DEC) << FIELDFLAG_DEC_SHIFT) |
1318
1319
              (maybe_null ? FIELDFLAG_MAYBE_NULL : 0) |
1319
1320
              (is_unsigned ? 0 : FIELDFLAG_DECIMAL));
 
1321
  is_stored= true;
1320
1322
}
1321
1323
 
1322
1324
 
1379
1381
  interval_list.empty();
1380
1382
 
1381
1383
  comment= *fld_comment;
 
1384
  is_stored= true;
1382
1385
 
1383
1386
  /*
1384
1387
    Set NO_DEFAULT_VALUE_FLAG if this field doesn't have a default value and
1738
1741
  charset=    old_field->charset();             // May be NULL ptr
1739
1742
  comment=    old_field->comment;
1740
1743
  decimals=   old_field->decimals();
 
1744
  is_stored= old_field->is_stored;
1741
1745
 
1742
1746
  /* Fix if the original table had 4 byte pointer blobs */
1743
1747
  if (flags & BLOB_FLAG)
1929
1933
  }
1930
1934
}
1931
1935
 
1932
 
bool Field::isRead() 
1933
 
{ 
1934
 
  return table->read_set->test(field_index); 
1935
 
}
1936
 
 
1937
 
 
1938
 
bool Field::isWrite()
1939
 
{ 
1940
 
  return table->write_set->test(field_index); 
1941
 
}
1942