diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-08 16:18:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2012-10-08 16:18:54 +0300 |
| commit | 52a4ef95e87af8d85f5682e9e643e563d41169c4 (patch) | |
| tree | 6c704d98f2f7c73c63716a63dec55c5c4b4aef98 /storage/innobase/include/dict0mem.h | |
| parent | bfba296d4084eab4b580cddc04e889ad2abdaeb2 (diff) | |
| parent | b06620868ea840beffcfaf36e905bfecd27cfa85 (diff) | |
| download | mariadb-git-52a4ef95e87af8d85f5682e9e643e563d41169c4.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Also, add debug check for trx_id sanity to row_upd_rec_sys_fields().
Diffstat (limited to 'storage/innobase/include/dict0mem.h')
| -rw-r--r-- | storage/innobase/include/dict0mem.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 4c371c8d5cf..980417715b3 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -377,10 +377,15 @@ struct dict_index_struct{ unsigned type:DICT_IT_BITS; /*!< index type (DICT_CLUSTERED, DICT_UNIQUE, DICT_UNIVERSAL, DICT_IBUF, DICT_CORRUPT) */ - unsigned trx_id_offset:10;/*!< position of the trx id column +#define MAX_KEY_LENGTH_BITS 12 + unsigned trx_id_offset:MAX_KEY_LENGTH_BITS; + /*!< position of the trx id column in a clustered index record, if the fields before it are known to be of a fixed size, 0 otherwise */ +#if (1<<MAX_KEY_LENGTH_BITS) < MAX_KEY_LENGTH +# error (1<<MAX_KEY_LENGTH_BITS) < MAX_KEY_LENGTH +#endif unsigned n_user_defined_cols:10; /*!< number of columns the user defined to be in the index: in the internal |