← 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-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
616
616
  {
617
617
    /* Read extra data segment */
618
618
    unsigned char *next_chunk, *buff_end;
619
 
    if (!(next_chunk= buff= (unsigned char*) my_malloc(n_length, MYF(MY_WME))))
 
619
    if (!(next_chunk= buff= (unsigned char*) malloc(n_length)))
620
620
      goto err;
621
621
    if (pread(file, buff, n_length, record_offset + share->reclength) == 0)
622
622
    {
1900
1900
  {
1901
1901
    length=uint2korr(head+4);
1902
1902
    my_seek(file,64L,MY_SEEK_SET,MYF(0));
1903
 
    if (!(buf= (unsigned char*) my_malloc((size_t) length+a_length+names*4,
1904
 
                                  MYF(MY_WME))) ||
 
1903
    if (!(buf= (unsigned char*) malloc(length+a_length+names*4)) ||
1905
1904
        my_read(file, buf+a_length, (size_t) (length+names*4),
1906
1905
                MYF(MY_NABP)))
1907
1906
    {                                           /* purecov: inspected */
1941
1940
 
1942
1941
  if (*to)
1943
1942
    free(*to);
1944
 
  if (!(*to= (unsigned char*) my_malloc(length+1,MYF(MY_WME))) ||
 
1943
  if (!(*to= (unsigned char*) malloc(length+1)) ||
1945
1944
      my_read(file, *to, length,MYF(MY_NABP)))
1946
1945
  {
1947
1946
    if (*to)