← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.c

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_open.c
860
860
  mi_int2store(ptr,base->max_key_length);               ptr +=2;
861
861
  mi_int2store(ptr,base->extra_alloc_bytes);            ptr +=2;
862
862
  *ptr++= base->extra_alloc_procent;
863
 
  *ptr++= base->raid_type;
864
 
  mi_int2store(ptr,base->raid_chunks);                  ptr +=2;
865
 
  mi_int4store(ptr,base->raid_chunksize);               ptr +=4;
 
863
  /* old raid info  slots */
 
864
  *ptr++= 0;
 
865
  mi_int2store(ptr,UINT16_C(0));                        ptr +=2;
 
866
  mi_int4store(ptr,UINT32_C(0));                        ptr +=4;
 
867
 
866
868
  memset(ptr, 0, 6);                                    ptr +=6; /* extra */
867
869
  return my_write(file, buff, (size_t) (ptr-buff), MYF(MY_NABP)) != 0;
868
870
}
894
896
  base->max_key_length = mi_uint2korr(ptr);             ptr +=2;
895
897
  base->extra_alloc_bytes = mi_uint2korr(ptr);          ptr +=2;
896
898
  base->extra_alloc_procent = *ptr++;
897
 
  base->raid_type= *ptr++;
898
 
  base->raid_chunks= mi_uint2korr(ptr);                 ptr +=2;
899
 
  base->raid_chunksize= mi_uint4korr(ptr);              ptr +=4;
900
 
  /* TO BE REMOVED: Fix for old RAID files */
901
 
  if (base->raid_type == 0)
902
 
  {
903
 
    base->raid_chunks=0;
904
 
    base->raid_chunksize=0;
905
 
  }
 
899
 
 
900
  /* advance past raid_type (1) raid_chunks (2) and raid_chunksize (4) */
 
901
  ptr+= 7; 
906
902
 
907
903
  ptr+=6;
908
904
  return ptr;
1043
1039
}
1044
1040
 
1045
1041
/**************************************************************************
1046
 
Open data file with or without RAID
 
1042
Open data file
1047
1043
We can't use dup() here as the data file descriptors need to have different
1048
1044
active seek-positions.
1049
1045