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
75dd3bcb
Commit
75dd3bcb
authored
Sep 16, 2017
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up after commit
93087d5f
Apply the same changes to both InnoDB and XtraDB.
parent
1d7bc3b5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
storage/innobase/btr/btr0cur.cc
storage/innobase/btr/btr0cur.cc
+1
-1
storage/innobase/include/page0zip.ic
storage/innobase/include/page0zip.ic
+1
-1
storage/xtradb/include/page0zip.ic
storage/xtradb/include/page0zip.ic
+1
-1
No files found.
storage/innobase/btr/btr0cur.cc
View file @
75dd3bcb
...
@@ -4106,7 +4106,7 @@ btr_estimate_number_of_different_key_vals(
...
@@ -4106,7 +4106,7 @@ btr_estimate_number_of_different_key_vals(
if
(
index
->
stat_index_size
>
1
)
{
if
(
index
->
stat_index_size
>
1
)
{
n_sample_pages
=
(
srv_stats_transient_sample_pages
<
index
->
stat_index_size
)
?
n_sample_pages
=
(
srv_stats_transient_sample_pages
<
index
->
stat_index_size
)
?
ut_min
(
index
->
stat_index_size
,
ut_min
(
index
->
stat_index_size
,
log2
(
index
->
stat_index_size
)
*
srv_stats_transient_sample_pages
)
ulint
(
log2
(
index
->
stat_index_size
)
*
srv_stats_transient_sample_pages
)
)
:
index
->
stat_index_size
;
:
index
->
stat_index_size
;
}
}
...
...
storage/innobase/include/page0zip.ic
View file @
75dd3bcb
...
@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
...
@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{
{
ut_ad(rec_size
ut_ad(rec_size
> (comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
>
ulint
(comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES));
ut_ad(ut_is_2pow(zip_size));
ut_ad(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size);
ut_ad(comp || !zip_size);
...
...
storage/xtradb/include/page0zip.ic
View file @
75dd3bcb
...
@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
...
@@ -174,7 +174,7 @@ page_zip_rec_needs_ext(
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
ulint zip_size) /*!< in: compressed page size in bytes, or 0 */
{
{
ut_ad(rec_size
ut_ad(rec_size
> ulint(
(comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES)
));
> ulint(
comp ? REC_N_NEW_EXTRA_BYTES : REC_N_OLD_EXTRA_BYTES
));
ut_ad(ut_is_2pow(zip_size));
ut_ad(ut_is_2pow(zip_size));
ut_ad(comp || !zip_size);
ut_ad(comp || !zip_size);
...
...
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