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
Georgios Dagkakis
slapos
Commits
9b820c09
Commit
9b820c09
authored
May 03, 2017
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/mariadb: version up 10.1.23 with a fix for MDEV-12281.
parent
1fb0ff92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+5
-2
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
+15
-0
component/mariadb/mariarocks.cfg
component/mariadb/mariarocks.cfg
+1
-0
No files found.
component/mariadb/buildout.cfg
View file @
9b820c09
...
...
@@ -22,11 +22,14 @@ parts =
[mariadb]
recipe = slapos.recipe.cmmi
url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.2
1/source/mariadb-10.1.21
.tar.gz
md5sum =
ff8b96edeeb22425117309a249055310
url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.2
3/source/mariadb-10.1.23
.tar.gz
md5sum =
1a7392cc05c7c249acd4495022719ca8
patch-options = -p0
patches =
${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
${:stable-patches}
stable-patches =
${:_profile_base_location_}/mariadb_10.1.22_MDEV-12281.patch#30ae2ca6ee4c64ae1008f4603fc400ed
location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-command = ${cmake:location}/bin/cmake
configure-options =
...
...
component/mariadb/mariadb_10.1.22_MDEV-12281.patch
0 → 100644
View file @
9b820c09
--- storage/innobase/dict/dict0stats.cc
+++ storage/innobase/dict/dict0stats.cc
@@ -1162,10 +1162,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
component/mariadb/mariarocks.cfg
View file @
9b820c09
[mariadb]
url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.5/source/mariadb-10.2.5.tar.gz
md5sum = 16fb01bb375c8d8a91a9ecf491397d51
stable-patches =
pre-configure =
sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
sed -i -e 's,set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT}),set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT} $${LIBRT}),' storage/rocksdb/build_rocksdb.cmake
...
...
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