← 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: 2009-01-10 22:27:38 UTC
  • mfrom: (779.1.8 devel)
  • Revision ID: brian@tangent.org-20090110222738-zx4zzq9lsa3othvn
Merge for Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
764
764
                           interval_count*sizeof(TYPELIB)+
765
765
                           (share->fields+interval_parts+
766
766
                            keys+3)*sizeof(char *)+
767
 
                           (n_length+int_length+com_length+
 
767
                           (n_length+int_length+
768
768
                               vcol_screen_length)))))
769
769
    goto err;                                   /* purecov: inspected */
770
770
 
783
783
    share->intervals= 0;                        // For better debugging
784
784
  memcpy(names, strpos+(share->fields*field_pack_length),
785
785
         (uint) (n_length+int_length));
786
 
  comment_pos= names+(n_length+int_length);
787
 
  memcpy(comment_pos, disk_buff+read_length-com_length-vcol_screen_length,
788
 
         com_length);
789
 
  vcol_screen_pos= names+(n_length+int_length+com_length);
 
786
  comment_pos= (char *)(disk_buff+read_length-com_length-vcol_screen_length);
 
787
  vcol_screen_pos= names+(n_length+int_length);
790
788
  memcpy(vcol_screen_pos, disk_buff+read_length-vcol_screen_length,
791
789
         vcol_screen_length);
792
790
 
899
897
      }
900
898
      else
901
899
      {
902
 
        comment.str=    (char*) comment_pos;
 
900
        comment.str=    strmake_root(&share->mem_root, comment_pos, comment_length);
903
901
        comment.length= comment_length;
904
902
        comment_pos+=   comment_length;
905
903
      }