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
64f96de7
Commit
64f96de7
authored
Feb 14, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SphinxSE to not leave Sphinx_error status variable uninitialized
parent
fb27ce22
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
mysql-test/suite/sphinx/sphinx.result
mysql-test/suite/sphinx/sphinx.result
+1
-1
storage/sphinx/ha_sphinx.cc
storage/sphinx/ha_sphinx.cc
+3
-1
No files found.
mysql-test/suite/sphinx/sphinx.result
View file @
64f96de7
...
@@ -48,7 +48,7 @@ SET optimizer_switch=@save_optimizer_switch;
...
@@ -48,7 +48,7 @@ SET optimizer_switch=@save_optimizer_switch;
drop table ts;
drop table ts;
show status like "sphinx_error%";
show status like "sphinx_error%";
Variable_name Value
Variable_name Value
Sphinx_error
OFF
Sphinx_error
show status like "sphinx_total%";
show status like "sphinx_total%";
Variable_name Value
Variable_name Value
Sphinx_total 2
Sphinx_total 2
...
...
storage/sphinx/ha_sphinx.cc
View file @
64f96de7
...
@@ -3575,11 +3575,13 @@ int sphinx_showfunc_words ( THD * thd, SHOW_VAR * out, char * sBuffer )
...
@@ -3575,11 +3575,13 @@ int sphinx_showfunc_words ( THD * thd, SHOW_VAR * out, char * sBuffer )
int
sphinx_showfunc_error
(
THD
*
thd
,
SHOW_VAR
*
out
,
char
*
)
int
sphinx_showfunc_error
(
THD
*
thd
,
SHOW_VAR
*
out
,
char
*
)
{
{
CSphSEStats
*
pStats
=
sphinx_get_stats
(
thd
,
out
);
CSphSEStats
*
pStats
=
sphinx_get_stats
(
thd
,
out
);
out
->
type
=
SHOW_CHAR
;
if
(
pStats
&&
pStats
->
m_bLastError
)
if
(
pStats
&&
pStats
->
m_bLastError
)
{
{
out
->
type
=
SHOW_CHAR
;
out
->
value
=
pStats
->
m_sLastMessage
;
out
->
value
=
pStats
->
m_sLastMessage
;
}
}
else
out
->
value
=
(
char
*
)
""
;
return
0
;
return
0
;
}
}
...
...
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