diff options
Diffstat (limited to 'storage/innobase/dict/dict0boot.cc')
| -rw-r--r-- | storage/innobase/dict/dict0boot.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc index 95bd9a48edd..618f6a2ad40 100644 --- a/storage/innobase/dict/dict0boot.cc +++ b/storage/innobase/dict/dict0boot.cc @@ -89,8 +89,7 @@ dict_hdr_get_new_id( } if (space_id) { - *space_id = mtr_read_ulint(dict_hdr + DICT_HDR_MAX_SPACE_ID, - MLOG_4BYTES, &mtr); + *space_id = mach_read_from_4(dict_hdr + DICT_HDR_MAX_SPACE_ID); if (fil_assign_new_space_id(space_id)) { mlog_write_ulint(dict_hdr + DICT_HDR_MAX_SPACE_ID, *space_id, MLOG_4BYTES, &mtr); @@ -323,9 +322,9 @@ dict_boot(void) dict_mem_index_add_field(index, "NAME", 0); index->id = DICT_TABLES_ID; - index = dict_index_add_to_cache( + dberr_t error = dict_index_add_to_cache( index, mach_read_from_4(dict_hdr + DICT_HDR_TABLES)); - ut_a(index); + ut_a(error == DB_SUCCESS); ut_ad(!table->is_instant()); table->indexes.start->n_core_null_bytes = UT_BITS_IN_BYTES( unsigned(table->indexes.start->n_nullable)); @@ -335,9 +334,9 @@ dict_boot(void) dict_mem_index_add_field(index, "ID", 0); index->id = DICT_TABLE_IDS_ID; - index = dict_index_add_to_cache( + error = dict_index_add_to_cache( index, mach_read_from_4(dict_hdr + DICT_HDR_TABLE_IDS)); - ut_a(index); + ut_a(error == DB_SUCCESS); /*-------------------------*/ table = dict_mem_table_create("SYS_COLUMNS", fil_system.sys_space, @@ -365,9 +364,9 @@ dict_boot(void) dict_mem_index_add_field(index, "POS", 0); index->id = DICT_COLUMNS_ID; - index = dict_index_add_to_cache( + error = dict_index_add_to_cache( index, mach_read_from_4(dict_hdr + DICT_HDR_COLUMNS)); - ut_a(index); + ut_a(error == DB_SUCCESS); ut_ad(!table->is_instant()); table->indexes.start->n_core_null_bytes = UT_BITS_IN_BYTES( unsigned(table->indexes.start->n_nullable)); @@ -408,9 +407,9 @@ dict_boot(void) dict_mem_index_add_field(index, "ID", 0); index->id = DICT_INDEXES_ID; - index = dict_index_add_to_cache( + error = dict_index_add_to_cache( index, mach_read_from_4(dict_hdr + DICT_HDR_INDEXES)); - ut_a(index); + ut_a(error == DB_SUCCESS); ut_ad(!table->is_instant()); table->indexes.start->n_core_null_bytes = UT_BITS_IN_BYTES( unsigned(table->indexes.start->n_nullable)); @@ -437,9 +436,9 @@ dict_boot(void) dict_mem_index_add_field(index, "POS", 0); index->id = DICT_FIELDS_ID; - index = dict_index_add_to_cache( + error = dict_index_add_to_cache( index, mach_read_from_4(dict_hdr + DICT_HDR_FIELDS)); - ut_a(index); + ut_a(error == DB_SUCCESS); ut_ad(!table->is_instant()); table->indexes.start->n_core_null_bytes = UT_BITS_IN_BYTES( unsigned(table->indexes.start->n_nullable)); |