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/myisammrg | |
| 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/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 7 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 8cb74c5df44..5d9b5b5808b 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -171,12 +171,6 @@ extern "C" void myrg_print_wrong_table(const char *table_name) } -const char **ha_myisammrg::bas_ext() const -{ - return ha_myisammrg_exts; -} - - const char *ha_myisammrg::index_type(uint key_number) { return ((table->key_info[key_number].flags & HA_FULLTEXT) ? @@ -1724,6 +1718,7 @@ static int myisammrg_init(void *p) myisammrg_hton->create= myisammrg_create_handler; myisammrg_hton->panic= myisammrg_panic; myisammrg_hton->flags= HTON_NO_PARTITION; + myisammrg_hton->tablefile_extensions= ha_myisammrg_exts; return 0; } diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h index 8007e7d04e8..455819c5526 100644 --- a/storage/myisammrg/ha_myisammrg.h +++ b/storage/myisammrg/ha_myisammrg.h @@ -82,7 +82,6 @@ public: ha_myisammrg(handlerton *hton, TABLE_SHARE *table_arg); ~ha_myisammrg(); - const char **bas_ext() const; const char *index_type(uint key_number); ulonglong table_flags() const { |