← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0pcur.c

Merge Monty - Updates to pandora-build to support features of gcc 4.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/btr/btr0pcur.c
43
43
{
44
44
        btr_pcur_t*     pcur;
45
45
 
46
 
        pcur = mem_alloc(sizeof(btr_pcur_t));
 
46
        pcur = (btr_pcur_t *)mem_alloc(sizeof(btr_pcur_t));
47
47
 
48
48
        pcur->btr_cur.index = NULL;
49
49
        btr_pcur_init(pcur);
177
177
 
178
178
        if (pcur_donate->old_rec_buf) {
179
179
 
180
 
                pcur_receive->old_rec_buf = mem_alloc(pcur_donate->buf_size);
 
180
                pcur_receive->old_rec_buf = (unsigned char *)mem_alloc(pcur_donate->buf_size);
181
181
 
182
182
                ut_memcpy(pcur_receive->old_rec_buf, pcur_donate->old_rec_buf,
183
183
                          pcur_donate->buf_size);