diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /storage/sphinx | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index f31669e931c..8a46167c92a 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -1,5 +1,5 @@ // -// $Id: ha_sphinx.cc 4507 2014-01-22 15:24:34Z deogar $ +// $Id: ha_sphinx.cc 4761 2014-07-03 07:24:02Z deogar $ // // @@ -153,7 +153,7 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal ) #define SPHINXSE_MAX_ALLOC (16*1024*1024) #define SPHINXSE_MAX_KEYWORDSTATS 4096 -#define SPHINXSE_VERSION "2.1.5-release" +#define SPHINXSE_VERSION "2.1.9-release" // FIXME? the following is cut-n-paste from sphinx.h and searchd.cpp // cut-n-paste is somewhat simpler that adding dependencies however.. @@ -2719,11 +2719,11 @@ const Item * ha_sphinx::cond_push ( const Item *cond ) break; // copy the query, and let know that we intercepted this condition - Item_string * pString = (Item_string *) args[1]; + String *pString= args[1]->val_str(NULL); pTls->m_bQuery = true; - strncpy ( pTls->m_sQuery, pString->str_value.c_ptr(), sizeof(pTls->m_sQuery) ); + strncpy ( pTls->m_sQuery, pString->c_ptr(), sizeof(pTls->m_sQuery) ); pTls->m_sQuery[sizeof(pTls->m_sQuery)-1] = '\0'; - pTls->m_pQueryCharset = pString->str_value.charset(); + pTls->m_pQueryCharset = pString->charset(); } else { @@ -3637,5 +3637,5 @@ maria_declare_plugin_end; #endif // >50100 // -// $Id: ha_sphinx.cc 4507 2014-01-22 15:24:34Z deogar $ +// $Id: ha_sphinx.cc 4761 2014-07-03 07:24:02Z deogar $ // |