← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

Viewing changes to storage/innobase/page/page0page.c

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/page/page0page.c
215
215
{
216
216
        page_t*         page            = buf_block_get_frame(block);
217
217
#ifndef UNIV_HOTBACKUP
218
 
        const ibool     is_hashed       = block->is_hashed;
219
 
 
220
 
        if (is_hashed) {
221
 
                rw_lock_x_lock(&btr_search_latch);
222
 
        }
223
 
 
224
218
        ut_ad(!mtr || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
225
219
#endif /* !UNIV_HOTBACKUP */
226
220
 
241
235
        } else {
242
236
                mach_write_to_8(page + (PAGE_HEADER + PAGE_MAX_TRX_ID), trx_id);
243
237
        }
244
 
 
245
 
#ifndef UNIV_HOTBACKUP
246
 
        if (is_hashed) {
247
 
                rw_lock_x_unlock(&btr_search_latch);
248
 
        }
249
 
#endif /* !UNIV_HOTBACKUP */
250
238
}
251
239
 
252
240
/************************************************************//**
1603
1591
                        " n_owned: %lu; heap_no: %lu; next rec: %lu\n",
1604
1592
                        (ulong) rec_get_n_owned_old(rec),
1605
1593
                        (ulong) rec_get_heap_no_old(rec),
1606
 
                        (ulong) rec_get_next_offs(rec, TRUE));
 
1594
                        (ulong) rec_get_next_offs(rec, FALSE));
1607
1595
        }
1608
1596
 
1609
1597
        page_rec_check(rec);
1610
1598
        rec_validate(rec, offsets);
1611
1599
}
1612
1600
 
 
1601
# ifdef UNIV_BTR_PRINT
1613
1602
/***************************************************************//**
1614
1603
This is used to print the contents of the directory for
1615
1604
debugging purposes. */
1770
1759
        page_dir_print(page, dn);
1771
1760
        page_print_list(block, index, rn);
1772
1761
}
 
1762
# endif /* UNIV_BTR_PRINT */
1773
1763
#endif /* !UNIV_HOTBACKUP */
1774
1764
 
1775
1765
/***************************************************************//**