Commit 0b1bc4bf authored by Eugene Kosov's avatar Eugene Kosov

cleanup: replace some mtr_read_ulint() with mach_read_from_4()

parent 792c9f9a
...@@ -127,8 +127,7 @@ dict_hdr_get_new_id( ...@@ -127,8 +127,7 @@ dict_hdr_get_new_id(
} }
if (space_id) { if (space_id) {
*space_id = mtr_read_ulint(dict_hdr + DICT_HDR_MAX_SPACE_ID, *space_id = mach_read_from_4(dict_hdr + DICT_HDR_MAX_SPACE_ID);
MLOG_4BYTES, &mtr);
if (fil_assign_new_space_id(space_id)) { if (fil_assign_new_space_id(space_id)) {
mlog_write_ulint(dict_hdr + DICT_HDR_MAX_SPACE_ID, mlog_write_ulint(dict_hdr + DICT_HDR_MAX_SPACE_ID,
*space_id, MLOG_4BYTES, &mtr); *space_id, MLOG_4BYTES, &mtr);
...@@ -362,9 +361,8 @@ dict_boot(void) ...@@ -362,9 +361,8 @@ dict_boot(void)
index->id = DICT_TABLES_ID; index->id = DICT_TABLES_ID;
error = dict_index_add_to_cache(table, index, error = dict_index_add_to_cache(table, index,
mtr_read_ulint(dict_hdr mach_read_from_4(dict_hdr
+ DICT_HDR_TABLES, + DICT_HDR_TABLES),
MLOG_4BYTES, &mtr),
FALSE); FALSE);
ut_a(error == DB_SUCCESS); ut_a(error == DB_SUCCESS);
...@@ -375,9 +373,8 @@ dict_boot(void) ...@@ -375,9 +373,8 @@ dict_boot(void)
index->id = DICT_TABLE_IDS_ID; index->id = DICT_TABLE_IDS_ID;
error = dict_index_add_to_cache(table, index, error = dict_index_add_to_cache(table, index,
mtr_read_ulint(dict_hdr mach_read_from_4(dict_hdr
+ DICT_HDR_TABLE_IDS, + DICT_HDR_TABLE_IDS),
MLOG_4BYTES, &mtr),
FALSE); FALSE);
ut_a(error == DB_SUCCESS); ut_a(error == DB_SUCCESS);
...@@ -408,9 +405,8 @@ dict_boot(void) ...@@ -408,9 +405,8 @@ dict_boot(void)
index->id = DICT_COLUMNS_ID; index->id = DICT_COLUMNS_ID;
error = dict_index_add_to_cache(table, index, error = dict_index_add_to_cache(table, index,
mtr_read_ulint(dict_hdr mach_read_from_4(dict_hdr
+ DICT_HDR_COLUMNS, + DICT_HDR_COLUMNS),
MLOG_4BYTES, &mtr),
FALSE); FALSE);
ut_a(error == DB_SUCCESS); ut_a(error == DB_SUCCESS);
...@@ -442,9 +438,8 @@ dict_boot(void) ...@@ -442,9 +438,8 @@ dict_boot(void)
index->id = DICT_INDEXES_ID; index->id = DICT_INDEXES_ID;
error = dict_index_add_to_cache(table, index, error = dict_index_add_to_cache(table, index,
mtr_read_ulint(dict_hdr mach_read_from_4(dict_hdr
+ DICT_HDR_INDEXES, + DICT_HDR_INDEXES),
MLOG_4BYTES, &mtr),
FALSE); FALSE);
ut_a(error == DB_SUCCESS); ut_a(error == DB_SUCCESS);
...@@ -470,9 +465,8 @@ dict_boot(void) ...@@ -470,9 +465,8 @@ dict_boot(void)
index->id = DICT_FIELDS_ID; index->id = DICT_FIELDS_ID;
error = dict_index_add_to_cache(table, index, error = dict_index_add_to_cache(table, index,
mtr_read_ulint(dict_hdr mach_read_from_4(dict_hdr
+ DICT_HDR_FIELDS, + DICT_HDR_FIELDS),
MLOG_4BYTES, &mtr),
FALSE); FALSE);
ut_a(error == DB_SUCCESS); ut_a(error == DB_SUCCESS);
......
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