diff options
| -rw-r--r-- | mysql-test/suite/sphinx/sphinx.result | 2 | ||||
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/sphinx/sphinx.result b/mysql-test/suite/sphinx/sphinx.result index 82c76335e0b..7248dbc6c27 100644 --- a/mysql-test/suite/sphinx/sphinx.result +++ b/mysql-test/suite/sphinx/sphinx.result @@ -48,7 +48,7 @@ SET optimizer_switch=@save_optimizer_switch; drop table ts; show status like "sphinx_error%"; Variable_name Value -Sphinx_error OFF +Sphinx_error show status like "sphinx_total%"; Variable_name Value Sphinx_total 2 diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 93cb43f3a92..822f6956d11 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -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 * ) { CSphSEStats * pStats = sphinx_get_stats ( thd, out ); + out->type = SHOW_CHAR; if ( pStats && pStats->m_bLastError ) { - out->type = SHOW_CHAR; out->value = pStats->m_sLastMessage; } + else + out->value = (char*)""; return 0; } |