diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-06-24 10:50:25 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-06-24 10:50:25 +0200 |
| commit | 26a9fbc416cc8afaf2099ce293334e85c76b50cb (patch) | |
| tree | a49b66fcdbc8775fca1b610019ab5dcc0094af20 /storage/sphinx | |
| parent | 6a0a4f00a1741df68c0d201e090f5d28f59410c8 (diff) | |
| download | mariadb-git-26a9fbc416cc8afaf2099ce293334e85c76b50cb.tar.gz | |
MDEV-4506: Parallel replication of group-committed transactions: Intermediate commit
First very rough sketch. We spawn and retire a pool of slave threads.
Test main.alias works, most likely not much else does.
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 5318592ab5f..c83cba43821 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -244,7 +244,7 @@ struct CSphUrl char * m_sBuffer; char * m_sFormatted; - char * m_sScheme; + const char * m_sScheme; char * m_sHost; char * m_sIndex; @@ -254,8 +254,8 @@ struct CSphUrl : m_sBuffer ( NULL ) , m_sFormatted ( NULL ) , m_sScheme ( SPHINXSE_DEFAULT_SCHEME ) - , m_sHost ( SPHINXSE_DEFAULT_HOST ) - , m_sIndex ( SPHINXSE_DEFAULT_INDEX ) + , m_sHost ( const_cast<char *>(SPHINXSE_DEFAULT_HOST) ) + , m_sIndex ( const_cast<char *>(SPHINXSE_DEFAULT_INDEX) ) , m_iPort ( SPHINXSE_DEFAULT_PORT ) {} @@ -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; @@ -446,7 +446,7 @@ int CSphUrl::Connect() uint uServerVersion; uint uClientVersion = htonl ( SPHINX_SEARCHD_PROTO ); int iSocket = -1; - char * pError = NULL; + const char * pError = NULL; do { iSocket = socket ( iDomain, SOCK_STREAM, 0 ); |