← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2010-11-14 23:15:42 UTC
  • mfrom: (1929.1.42 warning-stack-frame)
  • Revision ID: kalebral@gmail.com-20101114231542-fnnu6ydd2p17n582
Merge Monty - fix bug 672372: some functions use > 32k stack

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0merge.c
1426
1426
 
1427
1427
        heap = row_merge_heap_create(index, &buf, &offsets0, &offsets1);
1428
1428
 
 
1429
        buf = mem_heap_alloc(heap, sizeof(mrec_buf_t) * 3);
 
1430
 
1429
1431
        /* Write a record and read the next record.  Split the output
1430
1432
        file in two halves, which can be merged on the following pass. */
1431
1433
 
1532
1534
 
1533
1535
        heap = row_merge_heap_create(index, &buf, &offsets0, &offsets1);
1534
1536
 
 
1537
        buf = mem_heap_alloc(heap, sizeof(mrec_buf_t) * 3);
 
1538
 
1535
1539
        /* Write a record and read the next record.  Split the output
1536
1540
        file in two halves, which can be merged on the following pass. */
1537
1541