~drizzle-trunk/drizzle/development

Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

added added

removed removed

770

auto_key= key+ 1;

771

auto_key_type= field->key_type();

772

}

773

if ((uint)field->field_index + 1 > max_key_fieldnr)

773

if ((uint)field->position() + 1 > max_key_fieldnr)

774

{

775

/* Do not use seg->fieldnr as it's not reliable in case of temp tables */

776

max_key_fieldnr= field->field_index + 1;

776

max_key_fieldnr= field->position() + 1;

777

}

778

}

779

}