diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 17:08:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 17:08:49 +0200 |
| commit | 58e62d701e9d1c0a5ebb88f8a8779011c59ee735 (patch) | |
| tree | 33aac572b65ffe713b1cf09bae10903eb1e4f5ab /storage/sphinx | |
| parent | 09ece94fac5fc160e11e6bd46208e6c0be86e7e6 (diff) | |
| download | mariadb-git-58e62d701e9d1c0a5ebb88f8a8779011c59ee735.tar.gz | |
* move bas_ext from the handler to the handlerton
* provide a default bas_ext value of the empty list
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/ha_sphinx.cc | 13 | ||||
| -rw-r--r-- | storage/sphinx/ha_sphinx.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 3305875c124..afb6cea0a40 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -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 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 | |