← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/row/row0merge.cc

More casting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0merge.cc
191
191
        buf->heap = heap;
192
192
        buf->index = index;
193
193
        buf->max_tuples = max_tuples;
194
 
        buf->tuples = static_cast<dfield_t **>(mem_heap_alloc(heap,
 
194
        buf->tuples = static_cast<const dfield_t **>(mem_heap_alloc(heap,
195
195
                                     2 * max_tuples * sizeof *buf->tuples));
196
196
        buf->tmp_tuples = buf->tuples + max_tuples;
197
197
 
650
650
        mem_heap_t*     heap    = mem_heap_create(2 * i * sizeof **offsets1
651
651
                                                  + 3 * sizeof **buf);
652
652
 
653
 
        *buf = static_cast<mrec_buf_t**>(mem_heap_alloc(heap, 3 * sizeof **buf));
 
653
        *buf = static_cast<mrec_buf_t*>(mem_heap_alloc(heap, 3 * sizeof **buf));
654
654
        *offsets1 = static_cast<ulint*>(mem_heap_alloc(heap, i * sizeof **offsets1));
655
655
        *offsets2 = static_cast<ulint*>(mem_heap_alloc(heap, i * sizeof **offsets2));
656
656
 
1165
1165
 
1166
1166
        /* Create and initialize memory for record buffers */
1167
1167
 
1168
 
        merge_buf = static_cast<row_merge_buf_t *>(mem_alloc(n_index * sizeof *merge_buf));
 
1168
        merge_buf = static_cast<row_merge_buf_t **>(mem_alloc(n_index * sizeof *merge_buf));
1169
1169
 
1170
1170
        for (i = 0; i < n_index; i++) {
1171
1171
                merge_buf[i] = row_merge_buf_create(index[i]);
2639
2639
 
2640
2640
        merge_files = static_cast<merge_file_t *>(mem_alloc(n_indexes * sizeof *merge_files));
2641
2641
        block_size = 3 * sizeof *block;
2642
 
        block = static_cast<byte *>(os_mem_alloc_large(&block_size));
 
2642
        block = static_cast<row_merge_block_t *>(os_mem_alloc_large(&block_size));
2643
2643
 
2644
2644
        for (i = 0; i < n_indexes; i++) {
2645
2645