← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Nathan Williams
  • Date: 2009-06-05 22:51:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1063.
  • Revision ID: nathanlws@gmail.com-20090605225106-8xrsftpf50tdpumn
No actual code changes. Changed Create_field to CreateField to be consistent with coding standards.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
578
578
    field_offsets[fieldnr]= stored_columns_reclength;
579
579
 
580
580
    /* the below switch is very similar to
581
 
       Create_field::create_length_to_internal_length in field.cc
 
581
       CreateField::create_length_to_internal_length in field.cc
582
582
       (which should one day be replace by just this code)
583
583
    */
584
584
    switch(drizzle_field_type)
3403
3403
    0 if out of memory, Table object in case of success
3404
3404
*/
3405
3405
 
3406
 
Table *create_virtual_tmp_table(Session *session, List<Create_field> &field_list)
 
3406
Table *create_virtual_tmp_table(Session *session, List<CreateField> &field_list)
3407
3407
{
3408
3408
  uint32_t field_count= field_list.elements;
3409
3409
  uint32_t blob_count= 0;
3410
3410
  Field **field;
3411
 
  Create_field *cdef;                           /* column definition */
 
3411
  CreateField *cdef;                           /* column definition */
3412
3412
  uint32_t record_length= 0;
3413
3413
  uint32_t null_count= 0;                 /* number of columns which may be null */
3414
3414
  uint32_t null_pack_length;              /* NULL representation array length */
3436
3436
  table->setup_tmp_table_column_bitmaps(bitmaps);
3437
3437
 
3438
3438
  /* Create all fields and calculate the total length of record */
3439
 
  List_iterator_fast<Create_field> it(field_list);
 
3439
  List_iterator_fast<CreateField> it(field_list);
3440
3440
  while ((cdef= it++))
3441
3441
  {
3442
3442
    *field= make_field(share, NULL, 0, cdef->length,