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
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
Kirill Smelkov
mariadb
Commits
93047370
Commit
93047370
authored
May 05, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mroonga doesn't work in embedded anymore
specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
parent
1d3ea9ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
storage/mroonga/CMakeLists.txt
storage/mroonga/CMakeLists.txt
+1
-0
storage/mroonga/mysql-test/mroonga/storage/suite.pm
storage/mroonga/mysql-test/mroonga/storage/suite.pm
+5
-0
storage/mroonga/mysql-test/mroonga/wrapper/suite.pm
storage/mroonga/mysql-test/mroonga/wrapper/suite.pm
+5
-0
No files found.
storage/mroonga/CMakeLists.txt
View file @
93047370
...
@@ -319,6 +319,7 @@ if(MRN_BUNDLED)
...
@@ -319,6 +319,7 @@ if(MRN_BUNDLED)
mysql_add_plugin
(
mroonga
mysql_add_plugin
(
mroonga
${
MRN_ALL_SOURCES
}
${
MRN_ALL_SOURCES
}
STORAGE_ENGINE MODULE_ONLY
STORAGE_ENGINE MODULE_ONLY
RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES
${
MRN_LIBRARIES
}
)
LINK_LIBRARIES
${
MRN_LIBRARIES
}
)
else
()
else
()
add_library
(
mroonga MODULE
${
MRN_ALL_SOURCES
}
)
add_library
(
mroonga MODULE
${
MRN_ALL_SOURCES
}
)
...
...
storage/mroonga/mysql-test/mroonga/storage/suite.pm
View file @
93047370
...
@@ -5,6 +5,11 @@ package My::Suite::Mroonga;
...
@@ -5,6 +5,11 @@ package My::Suite::Mroonga;
return
"
No Mroonga engine
"
unless
$ENV
{
HA_MROONGA_SO
}
or
return
"
No Mroonga engine
"
unless
$ENV
{
HA_MROONGA_SO
}
or
$::mysqld_variables
{'
mroonga
'}
eq
"
ON
";
$::mysqld_variables
{'
mroonga
'}
eq
"
ON
";
# RECOMPILE_FOR_EMBEDDED also means that a plugin
# cannot be dynamically loaded into embedded
return
"
Not run for embedded server
"
if
$::opt_embedded_server
and
$ENV
{
HA_MROONGA_SO
};
sub
is_default
{
1
}
sub
is_default
{
1
}
my
$groonga_normalizer_mysql_dir
=
$::basedir
.
'
/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql
';
my
$groonga_normalizer_mysql_dir
=
$::basedir
.
'
/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql
';
...
...
storage/mroonga/mysql-test/mroonga/wrapper/suite.pm
View file @
93047370
...
@@ -4,6 +4,11 @@ package My::Suite::Mroonga;
...
@@ -4,6 +4,11 @@ package My::Suite::Mroonga;
return
"
No Mroonga engine
"
unless
$ENV
{
HA_MROONGA_SO
}
or
return
"
No Mroonga engine
"
unless
$ENV
{
HA_MROONGA_SO
}
or
$::mysqld_variables
{'
mroonga
'}
eq
"
ON
";
$::mysqld_variables
{'
mroonga
'}
eq
"
ON
";
#
# RECOMPILE_FOR_EMBEDDED also means that a plugin
# cannot be dynamically loaded into embedded
return
"
Not run for embedded server
"
if
$::opt_embedded_server
and
$ENV
{
HA_MROONGA_SO
};
sub
is_default
{
1
}
sub
is_default
{
1
}
...
...
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