← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/rem/rem0rec.cc

  • Committer: Lee Bieber
  • Date: 2010-12-28 17:42:52 UTC
  • mfrom: (2023.3.32 innodb-cxx)
  • Revision ID: kalebral@gmail.com-20101228174252-fy2isiqdaphf2gl3
Merge Monty, move innobase from C to C++

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/rem/rem0rec.cc
578
578
                                                     MEM_HEAP_DYNAMIC,
579
579
                                                     file, line);
580
580
                }
581
 
                offsets = mem_heap_alloc(*heap, size * sizeof(ulint));
 
581
                offsets = static_cast<unsigned long *>(mem_heap_alloc(*heap, size * sizeof(ulint)));
582
582
                rec_offs_set_n_alloc(offsets, size);
583
583
        }
584
584
 
1362
1362
                        mem_free(*buf);
1363
1363
                }
1364
1364
 
1365
 
                *buf = mem_alloc2(prefix_len, buf_size);
 
1365
                *buf = static_cast<byte *>(mem_alloc2(prefix_len, buf_size));
1366
1366
        }
1367
1367
 
1368
1368
        ut_memcpy(*buf, rec - area_start, prefix_len);
1488
1488
                        mem_free(*buf);
1489
1489
                }
1490
1490
 
1491
 
                *buf = mem_alloc2(prefix_len, buf_size);
 
1491
                *buf = static_cast<byte *>(mem_alloc2(prefix_len, buf_size));
1492
1492
        }
1493
1493
 
1494
1494
        memcpy(*buf, lens + 1, prefix_len);