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
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
Aurel
slapos
Commits
7e695727
Commit
7e695727
authored
7 years ago
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/mariadb: version up 10.1.26, including security fixes.
also update groonga 7.0.5 and mroonga-7.05.
parent
8830ed99
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
19 deletions
+30
-19
component/groonga/buildout.cfg
component/groonga/buildout.cfg
+2
-2
component/mariadb/1a910088ec55c61434029d8e1cc3c6192ac508d7.diff
...ent/mariadb/1a910088ec55c61434029d8e1cc3c6192ac508d7.diff
+12
-0
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+6
-5
component/mariadb/mroonga_boolean.patch
component/mariadb/mroonga_boolean.patch
+10
-12
No files found.
component/groonga/buildout.cfg
View file @
7e695727
...
@@ -14,8 +14,8 @@ extends =
...
@@ -14,8 +14,8 @@ extends =
[groonga]
[groonga]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/groonga/groonga-7.0.
4
.tar.gz
url = http://packages.groonga.org/source/groonga/groonga-7.0.
5
.tar.gz
md5sum =
90c8ddf58fecdf7dba1a053adc9b9974
md5sum =
d42dd98c5272ed2b9ab50ded54eb818b
# temporary patch to respect more tokens in natural language mode.
# temporary patch to respect more tokens in natural language mode.
patches =
patches =
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
...
...
This diff is collapsed.
Click to expand it.
component/mariadb/1a910088ec55c61434029d8e1cc3c6192ac508d7.diff
0 → 100644
View file @
7e695727
diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
index d2b227ff..337de968 100644
--- a/mrn_mysql_compat.h
+++ b/mrn_mysql_compat.h
@@ -362,6 +362,7 @@
#if defined(MRN_MARIADB_P) && \
((MYSQL_VERSION_ID >= 100207) || \
+ ((MYSQL_VERSION_ID >= 100126) && (MYSQL_VERSION_ID < 100200)) || \
((MYSQL_VERSION_ID >= 50557) && (MYSQL_VERSION_ID < 100000)))
# define mrn_create_partition_name(out, \
out_length, \
This diff is collapsed.
Click to expand it.
component/mariadb/buildout.cfg
View file @
7e695727
...
@@ -23,8 +23,8 @@ parts =
...
@@ -23,8 +23,8 @@ parts =
[mariadb]
[mariadb]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = https://downloads.mariadb.org/f/mariadb-10.1.2
5/source/mariadb-10.1.25
.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
url = https://downloads.mariadb.org/f/mariadb-10.1.2
6/source/mariadb-10.1.26
.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
md5sum =
6349e524bc449767c4650196d4141a02
md5sum =
bb88afb72434c6d567c742896dd50d41
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
...
@@ -73,8 +73,8 @@ post-install =
...
@@ -73,8 +73,8 @@ post-install =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/
# http://mroonga.github.com/
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-7.0
4
.tar.gz
url = http://packages.groonga.org/source/mroonga/mroonga-7.0
5
.tar.gz
md5sum =
1d889cdd0e4f3ac0a84d18d16ab920d
6
md5sum =
d289667a60a6aa78d8bc276ab61b299
6
pre-configure = set -e
pre-configure = set -e
rm -rf fake_mariadb_source
rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source
mkdir -p fake_mariadb_source
...
@@ -89,7 +89,8 @@ configure-options =
...
@@ -89,7 +89,8 @@ configure-options =
--disable-document
--disable-document
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
${:_profile_base_location_}/1a910088ec55c61434029d8e1cc3c6192ac508d7.diff#a8b8df4dd870a1a269dfd9dc6941467b
pre-build =
pre-build =
sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
environment =
environment =
...
...
This diff is collapsed.
Click to expand it.
component/mariadb/mroonga_boolean.patch
View file @
7e695727
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
--- mroonga-7.05/lib/mrn_query_parser.cpp~ 2017-07-27 07:47:36.000000000 +0200
index 06691fb..b59e685 100644
+++ mroonga-7.05/lib/mrn_query_parser.cpp 2017-08-14 11:19:25.339015061 +0200
--- a/ha_mroonga.cpp
@@ -52,7 +52,7 @@
+++ b/ha_mroonga.cpp
@@ -8283,7 +8283,7 @@
grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
const char *keyword
= NULL;
const char *raw_query
= NULL;
uint keyword
_length = 0;
size_t raw_query
_length = 0;
- grn_operator default_operator = GRN_OP_OR;
-
grn_operator default_operator = GRN_OP_OR;
+ grn_operator default_operator = GRN_OP_ADJUST;
+
grn_operator default_operator = GRN_OP_ADJUST;
grn_expr_flags expression_flags = 0;
grn_expr_flags expression_flags = 0;
generic_ft_init_ext_parse_pragma(info
,
parse_pragma(query
,
key
,
query_length
,
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