← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2008-08-05 06:19:05 UTC
  • mfrom: (244.1.1 drizzle-mem-ebay)
  • mto: This revision was merged to the branch mainline in revision 264.
  • Revision ID: brian@tangent.org-20080805061905-1r8krslxae65qh76
Merge from Harrison Fisk of the Ebay + Google Hash engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
534
534
    share->transactional= (ha_choice) (head[39] & 3);
535
535
    share->page_checksum= (ha_choice) ((head[39] >> 2) & 3);
536
536
    share->row_type= (row_type) head[40];
 
537
    share->block_size= uint4korr(head+43);
537
538
    share->table_charset= get_charset((uint) head[38],MYF(0));
538
539
    share->null_field_first= 1;
539
540
  }
2094
2095
    /* Next few bytes where for RAID support */
2095
2096
    fileinfo[41]= 0;
2096
2097
    fileinfo[42]= 0;
2097
 
    fileinfo[43]= 0;
 
2098
    int4store(fileinfo+43,create_info->block_size);
 
2099
 
2098
2100
    fileinfo[44]= 0;
2099
2101
    fileinfo[45]= 0;
2100
2102
    fileinfo[46]= 0;
2137
2139
  create_info->min_rows= share->min_rows;
2138
2140
  create_info->table_options= share->db_create_options;
2139
2141
  create_info->avg_row_length= share->avg_row_length;
 
2142
  create_info->block_size= share->block_size;
2140
2143
  create_info->row_type= share->row_type;
2141
2144
  create_info->default_table_charset= share->table_charset;
2142
2145
  create_info->table_charset= 0;