← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/ibuf/ibuf0ibuf.c

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/ibuf/ibuf0ibuf.c
1297
1297
        const rec_t*    rec)    /*!< in: ibuf record */
1298
1298
{
1299
1299
        ulint           len;
1300
 
        const byte*     field;
1301
1300
 
1302
1301
        ut_ad(ibuf_inside());
1303
1302
        ut_ad(rec_get_n_fields_old(rec) > 2);
1304
1303
 
1305
 
        field = rec_get_nth_field_old(rec, 1, &len);
 
1304
        (void) rec_get_nth_field_old(rec, 1, &len);
1306
1305
 
1307
1306
        if (len > 1) {
1308
1307
                /* This is a < 4.1.x format record */
3779
3778
        rec = page_rec_get_next(page_get_infimum_rec(page));
3780
3779
 
3781
3780
        if (page_rec_is_supremum(rec)) {
3782
 
                /* Empty pages can result from buffered delete operations.
3783
 
                The first record from the free list can be used to find the
3784
 
                father node. */
3785
 
                rec = page_header_get_ptr(page, PAGE_FREE);
3786
 
                if (UNIV_UNLIKELY(rec == NULL)) {
3787
 
                        fputs("InnoDB: Trying to insert a record from"
3788
 
                              " the insert buffer to an index page\n"
3789
 
                              "InnoDB: but the index page is empty!\n",
3790
 
                              stderr);
3791
 
                        goto dump;
3792
 
                }
 
3781
                fputs("InnoDB: Trying to insert a record from"
 
3782
                      " the insert buffer to an index page\n"
 
3783
                      "InnoDB: but the index page is empty!\n",
 
3784
                      stderr);
 
3785
                goto dump;
3793
3786
        }
3794
3787
 
3795
3788
        if (UNIV_UNLIKELY(rec_get_n_fields(rec, index)