diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 09:17:06 +0100 |
| commit | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (patch) | |
| tree | daff81c02baa6c2581d6abe3d746b8f35ee44f32 /storage/sphinx | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| parent | 39df665a3332bd9bfb2529419f534a49cfac388c (diff) | |
| download | mariadb-git-cb86ce60b9bade5ae7712d8f3f74668208ee3fd2.tar.gz | |
Merge MDEV-4506: Parallel replication into 10.0-base.
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 785b0ea6d97..75bac6423fc 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -311,12 +311,12 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen ) // unix-domain socket m_iPort = 0; if (!( m_sIndex = strrchr ( m_sHost, ':' ) )) - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = const_cast<char *>(SPHINXSE_DEFAULT_INDEX); else { *m_sIndex++ = '\0'; if ( !*m_sIndex ) - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = const_cast<char *>(SPHINXSE_DEFAULT_INDEX); } bOk = true; break; @@ -336,7 +336,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen ) if ( m_sIndex ) *m_sIndex++ = '\0'; else - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = const_cast<char *>(SPHINXSE_DEFAULT_INDEX); m_iPort = atoi(sPort); if ( !m_iPort ) @@ -348,7 +348,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen ) if ( m_sIndex ) *m_sIndex++ = '\0'; else - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = const_cast<char *>(SPHINXSE_DEFAULT_INDEX); } bOk = true; |