diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-06 11:05:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-06 11:05:44 +0300 |
| commit | 13141c9842c055406730daead25337e46a57f4d8 (patch) | |
| tree | d96f4894260f8a450b6779e4678eea72530c12ea /storage/sphinx | |
| parent | d042146e5b41b6222df3e6b4c16a44f3ef2939b7 (diff) | |
| download | mariadb-git-13141c9842c055406730daead25337e46a57f4d8.tar.gz | |
Fixed compiler warnings and test failures
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 2 | ||||
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index c66c1344138..e88464eb16c 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -2616,7 +2616,7 @@ int ha_sphinx::get_rec ( byte * buf, const byte *, uint ) for ( uint32 i=0; i<m_iAttrs; i++ ) { - longlong iValue64; + longlong iValue64= 0; uint32 uValue = UnpackDword (); if ( m_dAttrs[i].m_uType == SPH_ATTR_BIGINT ) iValue64 = ( (longlong)uValue<<32 ) | UnpackDword(); diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index a93aac0426e..9e8ddfc5218 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -248,9 +248,9 @@ struct CSphUrl CSphUrl() : m_sBuffer ( NULL ) , m_sFormatted ( NULL ) - , m_sScheme ( SPHINXSE_DEFAULT_SCHEME ) - , m_sHost ( SPHINXSE_DEFAULT_HOST ) - , m_sIndex ( SPHINXSE_DEFAULT_INDEX ) + , m_sScheme ( (char*) SPHINXSE_DEFAULT_SCHEME ) + , m_sHost ( (char*) SPHINXSE_DEFAULT_HOST ) + , m_sIndex ( (char*) SPHINXSE_DEFAULT_INDEX ) , m_iPort ( SPHINXSE_DEFAULT_PORT ) {} @@ -306,12 +306,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 = (char*) SPHINXSE_DEFAULT_INDEX; else { *m_sIndex++ = '\0'; if ( !*m_sIndex ) - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX; } bOk = true; break; @@ -331,7 +331,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen ) if ( m_sIndex ) *m_sIndex++ = '\0'; else - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX; m_iPort = atoi(sPort); if ( !m_iPort ) @@ -343,7 +343,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen ) if ( m_sIndex ) *m_sIndex++ = '\0'; else - m_sIndex = SPHINXSE_DEFAULT_INDEX; + m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX; } bOk = true; @@ -422,7 +422,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 ); @@ -505,7 +505,7 @@ CSphResponse::Read ( int iSocket, int iClientVersion ) DWORD uLength = ntohl ( sphUnalignedRead ( *(DWORD *) &sHeader[4] ) ); if ( iVersion < iClientVersion ) // fixme: warn - ; + {} if ( uLength <= SPHINXSE_MAX_ALLOC ) { |