diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-09-03 01:56:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-09-03 01:56:21 +0400 |
| commit | fbaaf3688d5fac4b1b867155a9f09575367c0f98 (patch) | |
| tree | 0e36d7dca37e6775e113c0547823dcd12ee502fe /storage/sphinx | |
| parent | 658a1e9420b062f767316ecf1dcb4b2837dfa27a (diff) | |
| download | mariadb-git-fbaaf3688d5fac4b1b867155a9f09575367c0f98.tar.gz | |
Moving Item::str_value from public to protected.
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index f31669e931c..dacf5d5bde6 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -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 { |