Commit e7c99981 authored by Marko Mäkelä's avatar Marko Mäkelä

Correct the definition of DICT_SYS_INDEXES_NAME_FIELD.

When row_merge_drop_temp_indexes() was reworked to drop the indexes
via the data dictionary cache, the code was broken because it would
read the index name from the wrong field.
parent c24b4973
2010-04-22 The InnoDB Team
* include/dict0boot.h, dict/dict0boot.c:
Fix a bug that prevented the crash recovery of fast CREATE INDEX
from dropping partially created indexes.
2010-04-21 The InnoDB Team 2010-04-21 The InnoDB Team
* btr/btr0btr.c: * btr/btr0btr.c:
......
...@@ -368,8 +368,8 @@ dict_boot(void) ...@@ -368,8 +368,8 @@ dict_boot(void)
#if DICT_SYS_INDEXES_TYPE_FIELD != 4 + 2 #if DICT_SYS_INDEXES_TYPE_FIELD != 4 + 2
#error "DICT_SYS_INDEXES_TYPE_FIELD != 4 + 2" #error "DICT_SYS_INDEXES_TYPE_FIELD != 4 + 2"
#endif #endif
#if DICT_SYS_INDEXES_NAME_FIELD != 1 + 2 #if DICT_SYS_INDEXES_NAME_FIELD != 2 + 2
#error "DICT_SYS_INDEXES_NAME_FIELD != 1 + 2" #error "DICT_SYS_INDEXES_NAME_FIELD != 2 + 2"
#endif #endif
table->id = DICT_INDEXES_ID; table->id = DICT_INDEXES_ID;
......
...@@ -137,7 +137,7 @@ clustered index */ ...@@ -137,7 +137,7 @@ clustered index */
#define DICT_SYS_INDEXES_PAGE_NO_FIELD 8 #define DICT_SYS_INDEXES_PAGE_NO_FIELD 8
#define DICT_SYS_INDEXES_SPACE_NO_FIELD 7 #define DICT_SYS_INDEXES_SPACE_NO_FIELD 7
#define DICT_SYS_INDEXES_TYPE_FIELD 6 #define DICT_SYS_INDEXES_TYPE_FIELD 6
#define DICT_SYS_INDEXES_NAME_FIELD 3 #define DICT_SYS_INDEXES_NAME_FIELD 4
/* When a row id which is zero modulo this number (which must be a power of /* When a row id which is zero modulo this number (which must be a power of
two) is assigned, the field DICT_HDR_ROW_ID on the dictionary header page is two) is assigned, the field DICT_HDR_ROW_ID on the dictionary header page is
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment