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
87d4af83
Commit
87d4af83
authored
Sep 21, 2010
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the sphinx test suite to work when sphinxse is statically linked into the server
parent
54708d35
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
mysql-test/suite/sphinx/my.cnf
mysql-test/suite/sphinx/my.cnf
+0
-3
mysql-test/suite/sphinx/suite.opt
mysql-test/suite/sphinx/suite.opt
+1
-0
mysql-test/suite/sphinx/suite.pm
mysql-test/suite/sphinx/suite.pm
+2
-1
No files found.
mysql-test/suite/sphinx/my.cnf
View file @
87d4af83
!include include/default_my.cnf
!include include/default_my.cnf
[mysqld.1]
plugin-load=@ENV.HA_SPHINX_SO
[source src1]
[source src1]
type = xmlpipe2
type = xmlpipe2
xmlpipe_command = cat suite/sphinx/testdata.xml
xmlpipe_command = cat suite/sphinx/testdata.xml
...
...
mysql-test/suite/sphinx/suite.opt
0 → 100644
View file @
87d4af83
--plugin-load=$HA_SPHINX_SO
mysql-test/suite/sphinx/suite.pm
View file @
87d4af83
...
@@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
...
@@ -24,7 +24,8 @@ my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
my
$exe_sphinx_searchd
=
&
locate_sphinx_binary
('
searchd
');
my
$exe_sphinx_searchd
=
&
locate_sphinx_binary
('
searchd
');
return
"
No Sphinx
"
unless
$exe_sphinx_indexer
and
$exe_sphinx_searchd
;
return
"
No Sphinx
"
unless
$exe_sphinx_indexer
and
$exe_sphinx_searchd
;
return
"
No SphinxSE
"
unless
$ENV
{
HA_SPHINX_SO
};
return
"
No SphinxSE
"
unless
$ENV
{
HA_SPHINX_SO
}
or
$::mysqld_variables
{'
sphinx
'}
eq
"
ON
";
{
{
local
$_
=
`
"
$exe_sphinx_searchd
" --help
`;
local
$_
=
`
"
$exe_sphinx_searchd
" --help
`;
...
...
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