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
isaak yansane-sisk
slapos
Commits
448af9ae
Commit
448af9ae
authored
Feb 29, 2016
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : MariaDB 10.0.12, groonga 6.0.0 and mroonga 6.00.
parent
893d200f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
component/groonga/buildout.cfg
component/groonga/buildout.cfg
+2
-2
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+5
-5
component/mariadb/mroonga_boolean.patch
component/mariadb/mroonga_boolean.patch
+7
-7
No files found.
component/groonga/buildout.cfg
View file @
448af9ae
...
...
@@ -13,8 +13,8 @@ extends =
[groonga]
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/groonga/groonga-
5.1.2
.tar.gz
md5sum =
04066b547f1f4dd869eb35ac52a2e88b
url = http://packages.groonga.org/source/groonga/groonga-
6.0.0
.tar.gz
md5sum =
cf230a41c73574db321eaf831fae3566
# temporary patch to respect more tokens in natural language mode.
patches =
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
...
...
component/mariadb/buildout.cfg
View file @
448af9ae
...
...
@@ -21,9 +21,9 @@ parts =
[mariadb]
recipe = slapos.recipe.cmmi
version = 10.1.1
1
version = 10.1.1
2
url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
md5sum =
c199608ae4282f16007dc8c270ff2439
md5sum =
a2c0809f27ec112139c2c50f03569b2b
location = ${buildout:parts-directory}/${:_buildout_section_name_}
patch-options = -p0
patches =
...
...
@@ -68,8 +68,8 @@ post-install =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-
5.12
.tar.gz
md5sum =
b42816754058114de708e1da028399bd
url = http://packages.groonga.org/source/mroonga/mroonga-
6.00
.tar.gz
md5sum =
f2ee5867cb820c88fa5d9eada3dbabc6
pre-configure =
mkdir fake_mariadb_source &&
ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
...
...
@@ -80,7 +80,7 @@ configure-options =
--disable-document
patch-options = -p1
patches =
${:_profile_base_location_}/mroonga_boolean.patch#
36645770ae612515b74b90884ecc59fc
${:_profile_base_location_}/mroonga_boolean.patch#
29f85fc98e85d39b31e53b1e1683d288
environment =
PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
...
...
component/mariadb/mroonga_boolean.patch
View file @
448af9ae
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
index
dd9967d..c105a62
100644
index
06691fb..b59e685
100644
--- a/ha_mroonga.cpp
+++ b/ha_mroonga.cpp
@@ -
7678,7 +7678
,7 @@
grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
@@ -
8283,7 +8283
,7 @@
grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
const char *keyword
, *keyword_original
;
uint keyword_length
, keyword_length_original
;
const char *keyword
= NULL
;
uint keyword_length
= 0
;
- grn_operator default_operator = GRN_OP_OR;
+ grn_operator default_operator = GRN_OP_ADJUST;
grn_
bool weight_specified = false
;
keyword = keyword_original = key->ptr();
keyword_length = keyword_length_original = key->length();
grn_
expr_flags expression_flags = 0
;
generic_ft_init_ext_parse_pragma(info,
key,
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