← Back to branch summary

~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/include/univ.i

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innodb_plugin/include/univ.i
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved.
4
4
Copyright (c) 2008, Google Inc.
5
 
Copyright (c) 2009, Sun Microsystems, Inc.
6
5
 
7
6
Portions of this file contain modifications contributed and copyrighted by
8
7
Google, Inc. Those modifications are gratefully acknowledged and are described
46
45
 
47
46
#define INNODB_VERSION_MAJOR    1
48
47
#define INNODB_VERSION_MINOR    0
49
 
#define INNODB_VERSION_BUGFIX   14
 
48
#define INNODB_VERSION_BUGFIX   17
50
49
 
51
50
/* The following is the InnoDB version as shown in
52
51
SELECT plugin_version FROM information_schema.plugins;
177
176
                                                debugging without UNIV_DEBUG */
178
177
#define UNIV_BUF_DEBUG                          /* Enable buffer pool
179
178
                                                debugging without UNIV_DEBUG */
 
179
#define UNIV_BLOB_LIGHT_DEBUG                   /* Enable off-page column
 
180
                                                debugging without UNIV_DEBUG */
180
181
#define UNIV_DEBUG                              /* Enable ut_ad() assertions
181
182
                                                and disable UNIV_INLINE */
182
183
#define UNIV_DEBUG_LOCK_VALIDATE                /* Enable
183
184
                                                ut_ad(lock_rec_validate_page())
184
185
                                                assertions. */
185
 
#define UNIV_DEBUG_FILE_ACCESSES                /* Debug .ibd file access
186
 
                                                (field file_page_was_freed
187
 
                                                in buf_page_t) */
 
186
#define UNIV_DEBUG_FILE_ACCESSES                /* Enable freed block access
 
187
                                                debugging without UNIV_DEBUG */
188
188
#define UNIV_LRU_DEBUG                          /* debug the buffer pool LRU */
189
189
#define UNIV_HASH_DEBUG                         /* debug HASH_ macros */
190
190
#define UNIV_LIST_DEBUG                         /* debug UT_LIST_ macros */
193
193
debugging redo log application problems. */
194
194
#define UNIV_MEM_DEBUG                          /* detect memory leaks etc */
195
195
#define UNIV_IBUF_DEBUG                         /* debug the insert buffer */
 
196
#define UNIV_BLOB_DEBUG                         /* track BLOB ownership;
 
197
assumes that no BLOBs survive server restart */
196
198
#define UNIV_IBUF_COUNT_DEBUG                   /* debug the insert buffer;
197
199
this limits the database to IBUF_COUNT_N_SPACES and IBUF_COUNT_N_PAGES,
198
200
and the insert buffer must be empty when the database is started */
296
298
longer names internally */
297
299
#define MAX_TABLE_NAME_LEN      192
298
300
 
 
301
/* The maximum length of a database name. Like MAX_TABLE_NAME_LEN this is
 
302
the MySQL's NAME_LEN, see check_and_convert_db_name(). */
 
303
#define MAX_DATABASE_NAME_LEN   MAX_TABLE_NAME_LEN
 
304
 
 
305
/* MAX_FULL_NAME_LEN defines the full name path including the
 
306
database name and table name. In addition, 14 bytes is added for:
 
307
        2 for surrounding quotes around table name
 
308
        1 for the separating dot (.)
 
309
        9 for the #mysql50# prefix */
 
310
#define MAX_FULL_NAME_LEN                               \
 
311
        (MAX_TABLE_NAME_LEN + MAX_DATABASE_NAME_LEN + 14)
 
312
 
299
313
/*
300
314
                        UNIVERSAL TYPE DEFINITIONS
301
315
                        ==========================
412
426
/* Use sun_prefetch when compile with Sun Studio */
413
427
# define UNIV_EXPECT(expr,value) (expr)
414
428
# define UNIV_LIKELY_NULL(expr) (expr)
415
 
# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many(addr)
 
429
# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many((void*) addr)
416
430
# define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr)
417
431
#else
418
432
/* Dummy versions of the macros */