← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Brian Aker
  • Date: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
756
756
}
757
757
 
758
758
 
759
 
bool Field::is_null_in_record_with_offset(my_ptrdiff_t offset)
 
759
bool Field::is_null_in_record_with_offset(my_ptrdiff_t with_offset)
760
760
{
761
761
  if (!null_ptr)
762
762
    return false;
763
 
  return test(null_ptr[offset] & null_bit);
 
763
  return test(null_ptr[with_offset] & null_bit);
764
764
}
765
765
 
766
766
 
1346
1346
}
1347
1347
 
1348
1348
 
1349
 
uint32_t Field::is_equal(Create_field *new_field)
 
1349
uint32_t Field::is_equal(Create_field *new_field_ptr)
1350
1350
{
1351
 
  return (new_field->sql_type == real_type());
 
1351
  return (new_field_ptr->sql_type == real_type());
1352
1352
}
1353
1353
 
1354
1354
/**
1476
1476
                        Item *fld_on_update_value, LEX_STRING *fld_comment,
1477
1477
                        char *fld_change, List<String> *fld_interval_list,
1478
1478
                        const CHARSET_INFO * const fld_charset,
1479
 
                        uint32_t, enum column_format_type column_format,
 
1479
                        uint32_t, enum column_format_type column_format_in,
1480
1480
                        virtual_column_info *fld_vcol_info)
1481
1481
{
1482
1482
  uint32_t sign_len, allowed_type_modifier= 0;
1486
1486
  field_name= fld_name;
1487
1487
  def= fld_default_value;
1488
1488
  flags= fld_type_modifier;
1489
 
  flags|= (((uint32_t)column_format & COLUMN_FORMAT_MASK) << COLUMN_FORMAT_FLAGS);
 
1489
  flags|= (((uint32_t)column_format_in & COLUMN_FORMAT_MASK) << COLUMN_FORMAT_FLAGS);
1490
1490
  unireg_check= (fld_type_modifier & AUTO_INCREMENT_FLAG ?
1491
1491
                 Field::NEXT_NUMBER : Field::NONE);
1492
1492
  decimals= fld_decimals ? (uint32_t)atoi(fld_decimals) : 0;
1951
1951
       old_field->table->timestamp_field != old_field ||  /* timestamp field */
1952
1952
       unireg_check == Field::TIMESTAMP_UN_FIELD))        /* has default val */
1953
1953
  {
1954
 
    char buff[MAX_FIELD_WIDTH];
1955
 
    String tmp(buff,sizeof(buff), charset);
1956
1954
    my_ptrdiff_t diff;
1957
1955
 
1958
1956
    /* Get the value from default_values */