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/archive | |
| 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/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 23 | ||||
| -rw-r--r-- | storage/archive/ha_archive.h | 1 |
2 files changed, 9 insertions, 15 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 5ee7841d9b3..02813ff8dc7 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -199,6 +199,14 @@ static void init_archive_psi_keys(void) TRUE Error */ +/* + We just implement one additional file extension. +*/ +static const char *ha_archive_exts[] = { + ARZ, + NullS +}; + int archive_db_init(void *p) { DBUG_ENTER("archive_db_init"); @@ -214,6 +222,7 @@ int archive_db_init(void *p) archive_hton->create= archive_create_handler; archive_hton->flags= HTON_NO_FLAGS; archive_hton->discover= archive_discover; + archive_hton->tablefile_extensions= ha_archive_exts; if (mysql_mutex_init(az_key_mutex_archive_mutex, &archive_mutex, MY_MUTEX_INIT_FAST)) @@ -530,20 +539,6 @@ int ha_archive::init_archive_reader() } -/* - We just implement one additional file extension. -*/ -static const char *ha_archive_exts[] = { - ARZ, - NullS -}; - -const char **ha_archive::bas_ext() const -{ - return ha_archive_exts; -} - - /* When opening a file we: Create/get our shared structure. diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 627267c7306..25e520f56dd 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -83,7 +83,6 @@ public: { } const char *index_type(uint inx) { return "NONE"; } - const char **bas_ext() const; ulonglong table_flags() const { return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_CAN_BIT_FIELD | |