← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0sea.cc

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-10-29 15:43:40 UTC
  • mfrom: (1.2.12) (2.1.19 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131029154340-2gp39el6cv8bwf2o
Tags: 1:7.2.3-2ubuntu1
* Merge from debian, remaining changes:
  - Link against boost_system because of boost_thread.
  - Add required libs to message/include.am
  - Add upstart job and adjust init script to be upstart compatible.
  - Disable -floop-parallelize-all due to gcc-4.8/4.9 compiler ICE
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57732

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/btr/btr0sea.cc
146
146
        be enough free space in the hash table. */
147
147
 
148
148
        if (heap->free_block == NULL) {
149
 
                buf_block_t*    block = buf_block_alloc(NULL, 0);
 
149
                buf_block_t*    block = buf_block_alloc(NULL);
150
150
 
151
151
                rw_lock_x_lock(&btr_search_latch);
152
152
 
1208
1208
        having to fear a deadlock. */
1209
1209
 
1210
1210
        block = buf_page_get_gen(space, zip_size, page_no, RW_S_LATCH, NULL,
1211
 
                                BUF_GET_IF_IN_POOL, __FILE__, __LINE__,
1212
 
                                &mtr);
 
1211
                                 BUF_PEEK_IF_IN_POOL, __FILE__, __LINE__,
 
1212
                                 &mtr);
1213
1213
        /* Because the buffer pool mutex was released by
1214
1214
        buf_page_peek_if_search_hashed(), it is possible that the
1215
1215
        block was removed from the buffer pool by another thread