diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
| commit | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (patch) | |
| tree | a9df7341e91623f62fe37cd47fce139d8888fc95 /storage/sphinx | |
| parent | 3a1c91d87d69ef243b3e78be6089102cafef0a8e (diff) | |
| parent | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (diff) | |
| download | mariadb-git-a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254.tar.gz | |
10.0-base merge
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 24 | ||||
| -rw-r--r-- | storage/sphinx/ha_sphinx.h | 1 |
2 files changed, 6 insertions, 19 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 3305875c124..23bf21b6cbe 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -1285,7 +1285,7 @@ CSphSEQuery::~CSphSEQuery () SafeDeleteArray ( m_sQueryBuffer ); SafeDeleteArray ( m_pWeights ); SafeDeleteArray ( m_pBuf ); - for ( int i=0; i<m_dOverrides.elements(); i++ ) + for ( size_t i=0; i<m_dOverrides.elements(); i++ ) SafeDelete ( m_dOverrides.at(i) ); SPH_VOID_RET(); } @@ -1865,7 +1865,7 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer ) iReqSize += 8 + strlen(m_sFieldWeight[i] ); // overrides iReqSize += 4; - for ( int i=0; i<m_dOverrides.elements(); i++ ) + for ( size_t i=0; i<m_dOverrides.elements(); i++ ) { CSphSEQuery::Override_t * pOverride = m_dOverrides.at(i); const uint32 uSize = pOverride->m_iType==SPH_ATTR_BIGINT ? 16 : 12; // id64 + value @@ -1972,13 +1972,13 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer ) // overrides SendInt ( m_dOverrides.elements() ); - for ( int i=0; i<m_dOverrides.elements(); i++ ) + for ( size_t i=0; i<m_dOverrides.elements(); i++ ) { CSphSEQuery::Override_t * pOverride = m_dOverrides.at(i); SendString ( pOverride->m_sName ); SendDword ( pOverride->m_iType ); SendInt ( pOverride->m_dIds.elements() ); - for ( int j=0; j<pOverride->m_dIds.elements(); j++ ) + for ( size_t j=0; j<pOverride->m_dIds.elements(); j++ ) { SendUint64 ( pOverride->m_dIds.at(j) ); if ( pOverride->m_iType==SPH_ATTR_FLOAT ) @@ -2005,9 +2005,6 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer ) // SPHINX HANDLER ////////////////////////////////////////////////////////////////////////////// -static const char * ha_sphinx_exts[] = { NullS }; - - #if MYSQL_VERSION_ID<50100 ha_sphinx::ha_sphinx ( TABLE_ARG * table ) : handler ( &sphinx_hton, table ) @@ -2047,16 +2044,6 @@ ha_sphinx::~ha_sphinx() } } - -// If frm_error() is called then we will use this to to find out what file extentions -// exist for the storage engine. This is also used by the default rename_table and -// delete_table method in handler.cc. -const char ** ha_sphinx::bas_ext() const -{ - return ha_sphinx_exts; -} - - // Used for opening tables. The name will be the name of the file. // A table is opened when it needs to be opened. For instance // when a request comes in for a select on the table (tables are not @@ -3437,7 +3424,8 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * ) // report and bail if ( sError[0] ) { - my_error ( ER_CANT_CREATE_TABLE, MYF(0), sError, -1 ); + my_error ( ER_CANT_CREATE_TABLE, MYF(0), + table->s->db.str, table->s->table_name, sError ); SPH_RET(-1); } diff --git a/storage/sphinx/ha_sphinx.h b/storage/sphinx/ha_sphinx.h index f2aa726791b..f650e1641da 100644 --- a/storage/sphinx/ha_sphinx.h +++ b/storage/sphinx/ha_sphinx.h @@ -57,7 +57,6 @@ public: const char * table_type () const { return "SPHINX"; } ///< SE name for display purposes const char * index_type ( uint ) { return "HASH"; } ///< index type name for display purposes - const char ** bas_ext () const; ///< my file extensions #if MYSQL_VERSION_ID>50100 ulonglong table_flags () const { return HA_CAN_INDEX_BLOBS | |