1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix SphinxSE to not leave Sphinx_error status variable uninitialized

Browse Source
This commit is contained in:
Sergei Golubchik 2014-02-14 15:16:23 +01:00
parent fb27ce22f7
commit 64f96de766
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/sphinx/sphinx.result
View File

@ -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

4
storage/sphinx/ha_sphinx.cc
View File

@ -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;
} }