diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
| commit | a7139dd280e82a25ce2cbab80a10234b3911f215 (patch) | |
| tree | 717a0df66b78f8229972912ed8c3b2c072894942 /innobase/include/dict0mem.h | |
| parent | 3414f67485dc7c6d55428691d8a62410bb8c630b (diff) | |
| download | mariadb-git-a7139dd280e82a25ce2cbab80a10234b3911f215.tar.gz | |
Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613
innobase/trx/trx0sys.c:
Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
innobase/dict/dict0dict.c:
Exclude
innobase/dict/dict0mem.c:
Exclude
innobase/ha/hash0hash.c:
Exclude
innobase/include/data0data.h:
Exclude
innobase/include/dict0mem.h:
Exclude
innobase/include/hash0hash.h:
Exclude
innobase/include/hash0hash.ic:
Exclude
innobase/include/mtr0mtr.h:
Exclude
innobase/include/row0ins.h:
Exclude
innobase/include/row0upd.h:
Exclude
innobase/row/row0ins.c:
Exclude
innobase/row/row0upd.c:
Exclude
innobase/thr/thr0loc.c:
Exclude
Diffstat (limited to 'innobase/include/dict0mem.h')
| -rw-r--r-- | innobase/include/dict0mem.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/innobase/include/dict0mem.h b/innobase/include/dict0mem.h index 439adf6f52e..6d6e95ab511 100644 --- a/innobase/include/dict0mem.h +++ b/innobase/include/dict0mem.h @@ -186,12 +186,11 @@ struct dict_tree_struct{ the list; if the tree is of the mixed type, the first index in the list is the index of the cluster which owns the tree */ -#ifdef UNIV_DEBUG ulint magic_n;/* magic number */ -#define DICT_TREE_MAGIC_N 7545676 -#endif /* UNIV_DEBUG */ }; +#define DICT_TREE_MAGIC_N 7545676 + /* Data structure for an index */ struct dict_index_struct{ dulint id; /* id of the index */ @@ -236,10 +235,7 @@ struct dict_index_struct{ ulint stat_n_leaf_pages; /* approximate number of leaf pages in the index tree */ -#ifdef UNIV_DEBUG ulint magic_n;/* magic number */ -#define DICT_INDEX_MAGIC_N 76789786 -#endif /* UNIV_DEBUG */ }; /* Data structure for a foreign key constraint; an example: @@ -290,6 +286,9 @@ a foreign key constraint is enforced, therefore RESTRICT just means no flag */ #define DICT_FOREIGN_ON_DELETE_NO_ACTION 16 #define DICT_FOREIGN_ON_UPDATE_NO_ACTION 32 + +#define DICT_INDEX_MAGIC_N 76789786 + /* Data structure for a database table */ struct dict_table_struct{ dulint id; /* id of the table or cluster */ @@ -401,12 +400,10 @@ struct dict_table_struct{ inited; MySQL gets the init value by executing SELECT MAX(auto inc column) */ ib_longlong autoinc;/* autoinc counter value to give to the - next inserted row */ -#ifdef UNIV_DEBUG + next inserted row */ ulint magic_n;/* magic number */ -#define DICT_TABLE_MAGIC_N 76333786 -#endif /* UNIV_DEBUG */ }; +#define DICT_TABLE_MAGIC_N 76333786 #ifndef UNIV_NONINL #include "dict0mem.ic" |