← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

Viewing changes to storage/innobase/include/btr0cur.ic

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/btr0cur.ic
27
27
#include "btr0btr.h"
28
28
 
29
29
#ifdef UNIV_DEBUG
 
30
# define LIMIT_OPTIMISTIC_INSERT_DEBUG(NREC, CODE)\
 
31
if (btr_cur_limit_optimistic_insert_debug\
 
32
    && (NREC) >= (ulint)btr_cur_limit_optimistic_insert_debug) {\
 
33
        CODE;\
 
34
}
 
35
#else
 
36
# define LIMIT_OPTIMISTIC_INSERT_DEBUG(NREC, CODE)
 
37
#endif /* UNIV_DEBUG */
 
38
 
 
39
#ifdef UNIV_DEBUG
30
40
/*********************************************************//**
31
41
Returns the page cursor component of a tree cursor.
32
42
@return pointer to page cursor component */
146
156
 
147
157
        page = btr_cur_get_page(cursor);
148
158
 
 
159
        LIMIT_OPTIMISTIC_INSERT_DEBUG(page_get_n_recs(page) * 2,
 
160
                                      return(FALSE));
 
161
 
149
162
        if ((page_get_data_size(page) < BTR_CUR_PAGE_COMPRESS_LIMIT)
150
163
            || ((btr_page_get_next(page, mtr) == FIL_NULL)
151
164
                && (btr_page_get_prev(page, mtr) == FIL_NULL))) {