diff options
| author | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-09-01 11:27:53 +0530 |
|---|---|---|
| committer | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-09-01 11:27:53 +0530 |
| commit | 3f0e739e3ef184dc5b518caeefdbd7c49ce0fc37 (patch) | |
| tree | 3b9186c9c1a3c78e7b1ffcd9ceebca331c262867 /storage/innobase/include | |
| parent | 51af13e6c49d50a16ebc264cceb812584ea27815 (diff) | |
| parent | f3a6816fe541c24f41fd8045f78e28eb1da2ce9a (diff) | |
| download | mariadb-git-3f0e739e3ef184dc5b518caeefdbd7c49ce0fc37.tar.gz | |
Merge from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/univ.i | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 3394fc576cb..ed32fb9bf47 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -295,6 +295,24 @@ management to ensure correct alignment for doubles etc. */ ======================== */ +/** There are currently two InnoDB file formats which are used to group +features with similar restrictions and dependencies. Using an enum allows +switch statements to give a compiler warning when a new one is introduced. */ +enum innodb_file_formats_enum { + /** Antelope File Format: InnoDB/MySQL up to 5.1. + This format includes REDUNDANT and COMPACT row formats */ + UNIV_FORMAT_A = 0, + + /** Barracuda File Format: Introduced in InnoDB plugin for 5.1: + This format includes COMPRESSED and DYNAMIC row formats. It + includes the ability to create secondary indexes from data that + is not on the clustered index page and the ability to store more + data off the clustered index page. */ + UNIV_FORMAT_B = 1 +}; + +typedef enum innodb_file_formats_enum innodb_file_formats_t; + /* The 2-logarithm of UNIV_PAGE_SIZE: */ #define UNIV_PAGE_SIZE_SHIFT 14 /* The universal page size of the database */ |