Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
slapos
Commits
57c83f61
Commit
57c83f61
authored
Jun 01, 2017
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/mariadb: version up 10.2.4.
parent
c5848bc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
35 deletions
+2
-35
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-3
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
+0
-32
No files found.
component/mariadb/buildout.cfg
View file @
57c83f61
...
@@ -23,14 +23,13 @@ parts =
...
@@ -23,14 +23,13 @@ parts =
[mariadb]
[mariadb]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.2
3/source/mariadb-10.1.23
.tar.gz
url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.2
4/source/mariadb-10.1.24
.tar.gz
md5sum =
1a7392cc05c7c249acd4495022719ca8
md5sum =
e1af4c62e3345b65975f2fa43a0040d2
patch-options = -p0
patch-options = -p0
patches =
patches =
${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
${:stable-patches}
${:stable-patches}
stable-patches =
stable-patches =
${:_profile_base_location_}/mariadb_10.1.22_MDEV-12281.patch#b3ab5f92edc72e70619f2442dd82869b
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-command = ${cmake:location}/bin/cmake
configure-command = ${cmake:location}/bin/cmake
configure-options =
configure-options =
...
...
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
deleted
100644 → 0
View file @
c5848bc8
diff -ur storage/innobase/dict/dict0stats.cc storage/innobase/dict/dict0stats.cc
--- storage/innobase/dict/dict0stats.cc 2017-05-02 07:13:44.000000000 +0200
+++ storage/innobase/dict/dict0stats.cc 2017-05-09 09:53:43.498678672 +0200
@@ -1168,10 +1168,10 @@
leaf-level delete marks because delete marks on
non-leaf level do not make sense. */
- if (level == 0 && srv_stats_include_delete_marked? 0:
+ if (level == 0 && (srv_stats_include_delete_marked? 0:
rec_get_deleted_flag(
rec,
- page_is_comp(btr_pcur_get_page(&pcur)))) {
+ page_is_comp(btr_pcur_get_page(&pcur))))) {
if (rec_is_last_on_page
&& !prev_rec_is_copied
diff -ur storage/xtradb/dict/dict0stats.cc storage/xtradb/dict/dict0stats.cc
--- storage/xtradb/dict/dict0stats.cc 2017-05-02 07:13:52.000000000 +0200
+++ storage/xtradb/dict/dict0stats.cc 2017-05-09 09:53:50.174738190 +0200
@@ -1168,10 +1168,10 @@
leaf-level delete marks because delete marks on
non-leaf level do not make sense. */
- if (level == 0 && srv_stats_include_delete_marked? 0:
+ if (level == 0 && (srv_stats_include_delete_marked? 0:
rec_get_deleted_flag(
rec,
- page_is_comp(btr_pcur_get_page(&pcur)))) {
+ page_is_comp(btr_pcur_get_page(&pcur))))) {
if (rec_is_last_on_page
&& !prev_rec_is_copied
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