Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0b1bc4bf
Commit
0b1bc4bf
authored
5 years ago
by
Eugene Kosov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: replace some mtr_read_ulint() with mach_read_from_4()
parent
792c9f9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
17 deletions
+11
-17
storage/innobase/dict/dict0boot.cc
storage/innobase/dict/dict0boot.cc
+11
-17
No files found.
storage/innobase/dict/dict0boot.cc
View file @
0b1bc4bf
...
...
@@ -127,8 +127,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
);
...
...
@@ -362,9 +361,8 @@ dict_boot(void)
index
->
id
=
DICT_TABLES_ID
;
error
=
dict_index_add_to_cache
(
table
,
index
,
mtr_read_ulint
(
dict_hdr
+
DICT_HDR_TABLES
,
MLOG_4BYTES
,
&
mtr
),
mach_read_from_4
(
dict_hdr
+
DICT_HDR_TABLES
),
FALSE
);
ut_a
(
error
==
DB_SUCCESS
);
...
...
@@ -375,9 +373,8 @@ dict_boot(void)
index
->
id
=
DICT_TABLE_IDS_ID
;
error
=
dict_index_add_to_cache
(
table
,
index
,
mtr_read_ulint
(
dict_hdr
+
DICT_HDR_TABLE_IDS
,
MLOG_4BYTES
,
&
mtr
),
mach_read_from_4
(
dict_hdr
+
DICT_HDR_TABLE_IDS
),
FALSE
);
ut_a
(
error
==
DB_SUCCESS
);
...
...
@@ -408,9 +405,8 @@ dict_boot(void)
index
->
id
=
DICT_COLUMNS_ID
;
error
=
dict_index_add_to_cache
(
table
,
index
,
mtr_read_ulint
(
dict_hdr
+
DICT_HDR_COLUMNS
,
MLOG_4BYTES
,
&
mtr
),
mach_read_from_4
(
dict_hdr
+
DICT_HDR_COLUMNS
),
FALSE
);
ut_a
(
error
==
DB_SUCCESS
);
...
...
@@ -442,9 +438,8 @@ dict_boot(void)
index
->
id
=
DICT_INDEXES_ID
;
error
=
dict_index_add_to_cache
(
table
,
index
,
mtr_read_ulint
(
dict_hdr
+
DICT_HDR_INDEXES
,
MLOG_4BYTES
,
&
mtr
),
mach_read_from_4
(
dict_hdr
+
DICT_HDR_INDEXES
),
FALSE
);
ut_a
(
error
==
DB_SUCCESS
);
...
...
@@ -470,9 +465,8 @@ dict_boot(void)
index
->
id
=
DICT_FIELDS_ID
;
error
=
dict_index_add_to_cache
(
table
,
index
,
mtr_read_ulint
(
dict_hdr
+
DICT_HDR_FIELDS
,
MLOG_4BYTES
,
&
mtr
),
mach_read_from_4
(
dict_hdr
+
DICT_HDR_FIELDS
),
FALSE
);
ut_a
(
error
==
DB_SUCCESS
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment