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
fcaf6194
Commit
fcaf6194
authored
Apr 21, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the "register" keyword
parent
88b1905e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
20 deletions
+14
-20
storage/innobase/page/page0page.cc
storage/innobase/page/page0page.cc
+7
-10
storage/xtradb/page/page0page.cc
storage/xtradb/page/page0page.cc
+7
-10
No files found.
storage/innobase/page/page0page.cc
View file @
fcaf6194
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU General Public License as published by the Free Software
...
@@ -93,17 +94,13 @@ page_dir_find_owner_slot(
...
@@ -93,17 +94,13 @@ page_dir_find_owner_slot(
/*=====================*/
/*=====================*/
const
rec_t
*
rec
)
/*!< in: the physical record */
const
rec_t
*
rec
)
/*!< in: the physical record */
{
{
const
page_t
*
page
;
register
uint16
rec_offs_bytes
;
register
const
page_dir_slot_t
*
slot
;
register
const
page_dir_slot_t
*
first_slot
;
register
const
rec_t
*
r
=
rec
;
ut_ad
(
page_rec_check
(
rec
));
ut_ad
(
page_rec_check
(
rec
));
page
=
page_align
(
rec
);
const
page_t
*
page
=
page_align
(
rec
);
first_slot
=
page_dir_get_nth_slot
(
page
,
0
);
const
page_dir_slot_t
*
first_slot
=
page_dir_get_nth_slot
(
page
,
0
);
slot
=
page_dir_get_nth_slot
(
page
,
page_dir_get_n_slots
(
page
)
-
1
);
const
page_dir_slot_t
*
slot
=
page_dir_get_nth_slot
(
page
,
page_dir_get_n_slots
(
page
)
-
1
);
const
rec_t
*
r
=
rec
;
if
(
page_is_comp
(
page
))
{
if
(
page_is_comp
(
page
))
{
while
(
rec_get_n_owned_new
(
r
)
==
0
)
{
while
(
rec_get_n_owned_new
(
r
)
==
0
)
{
...
@@ -119,7 +116,7 @@ page_dir_find_owner_slot(
...
@@ -119,7 +116,7 @@ page_dir_find_owner_slot(
}
}
}
}
rec_offs_bytes
=
mach_encode_2
(
r
-
page
);
uint16
rec_offs_bytes
=
mach_encode_2
(
r
-
page
);
while
(
UNIV_LIKELY
(
*
(
uint16
*
)
slot
!=
rec_offs_bytes
))
{
while
(
UNIV_LIKELY
(
*
(
uint16
*
)
slot
!=
rec_offs_bytes
))
{
...
...
storage/xtradb/page/page0page.cc
View file @
fcaf6194
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU General Public License as published by the Free Software
...
@@ -98,17 +99,13 @@ page_dir_find_owner_slot(
...
@@ -98,17 +99,13 @@ page_dir_find_owner_slot(
/*=====================*/
/*=====================*/
const
rec_t
*
rec
)
/*!< in: the physical record */
const
rec_t
*
rec
)
/*!< in: the physical record */
{
{
const
page_t
*
page
;
register
uint16
rec_offs_bytes
;
register
const
page_dir_slot_t
*
slot
;
register
const
page_dir_slot_t
*
first_slot
;
register
const
rec_t
*
r
=
rec
;
ut_ad
(
page_rec_check
(
rec
));
ut_ad
(
page_rec_check
(
rec
));
page
=
page_align
(
rec
);
const
page_t
*
page
=
page_align
(
rec
);
first_slot
=
page_dir_get_nth_slot
(
page
,
0
);
const
page_dir_slot_t
*
first_slot
=
page_dir_get_nth_slot
(
page
,
0
);
slot
=
page_dir_get_nth_slot
(
page
,
page_dir_get_n_slots
(
page
)
-
1
);
const
page_dir_slot_t
*
slot
=
page_dir_get_nth_slot
(
page
,
page_dir_get_n_slots
(
page
)
-
1
);
const
rec_t
*
r
=
rec
;
if
(
page_is_comp
(
page
))
{
if
(
page_is_comp
(
page
))
{
while
(
rec_get_n_owned_new
(
r
)
==
0
)
{
while
(
rec_get_n_owned_new
(
r
)
==
0
)
{
...
@@ -124,7 +121,7 @@ page_dir_find_owner_slot(
...
@@ -124,7 +121,7 @@ page_dir_find_owner_slot(
}
}
}
}
rec_offs_bytes
=
mach_encode_2
(
r
-
page
);
uint16
rec_offs_bytes
=
mach_encode_2
(
r
-
page
);
while
(
UNIV_LIKELY
(
*
(
uint16
*
)
slot
!=
rec_offs_bytes
))
{
while
(
UNIV_LIKELY
(
*
(
uint16
*
)
slot
!=
rec_offs_bytes
))
{
...
...
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