← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/univ.i

  • Committer: Olaf van der Spek
  • Date: 2011-08-11 09:18:19 UTC
  • mfrom: (2395 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2396.
  • Revision ID: olafvdspek@gmail.com-20110811091819-em9vnmtco1zt6uvm
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/univ.i
315
315
                        ========================
316
316
*/
317
317
 
318
 
/* The 2-logarithm of UNIV_PAGE_SIZE: */
319
 
#define UNIV_PAGE_SIZE_SHIFT    14
320
 
/* The universal page size of the database */
321
 
#define UNIV_PAGE_SIZE          (1 << UNIV_PAGE_SIZE_SHIFT)
 
318
/* The 2-logarithm of UNIV_PAGE_SIZE_MAX: */
 
319
#define UNIV_PAGE_SIZE_SHIFT_MAX        14
 
320
#define UNIV_PAGE_SIZE_SHIFT    srv_page_size_shift
 
321
/* The upper bound of universal page size of the database */
 
322
#define UNIV_PAGE_SIZE_MAX      (1 << UNIV_PAGE_SIZE_SHIFT_MAX)
 
323
#define UNIV_PAGE_SIZE          srv_page_size
322
324
 
323
325
/* Maximum number of parallel threads in a parallelized operation */
324
326
#define UNIV_MAX_PARALLELISM    32
434
436
stored part of the field in the tablespace. The length field then
435
437
contains the sum of the following flag and the locally stored len. */
436
438
 
437
 
#define UNIV_EXTERN_STORAGE_FIELD (UNIV_SQL_NULL - UNIV_PAGE_SIZE)
 
439
#define UNIV_EXTERN_STORAGE_FIELD (UNIV_SQL_NULL - UNIV_PAGE_SIZE_MAX)
438
440
 
439
441
/* Some macros to improve branch prediction and reduce cache misses */
440
442
#if defined(__GNUC__) && (__GNUC__ > 2) && ! defined(__INTEL_COMPILER)
537
539
        UNIV_MEM_ALLOC(addr, size);                     \
538
540
} while (0)
539
541
 
 
542
/* The 2-logarithm of srv_page_size */
 
543
extern ulint    srv_page_size_shift;
 
544
/* The universal page size of the database */
 
545
extern ulint    srv_page_size;
540
546
#endif