mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0.
mysql-test/r/merge.result: Added test result for BUG#7377. mysql-test/t/merge.test: Added test for BUG#7377. sql/ha_myisammrg.cc: Added implementation for handler::index_type. sql/ha_myisammrg.h: Added implementation for handler::index_type.
This commit is contained in:
parent
1548c6b765
commit
b4c61152d3
4 changed files with 20 additions and 0 deletions
|
|
@ -35,6 +35,17 @@
|
|||
const char **ha_myisammrg::bas_ext() const
|
||||
{ static const char *ext[]= { ".MRG", NullS }; return ext; }
|
||||
|
||||
const char *ha_myisammrg::index_type(uint key_number)
|
||||
{
|
||||
return ((table->key_info[key_number].flags & HA_FULLTEXT) ?
|
||||
"FULLTEXT" :
|
||||
(table->key_info[key_number].flags & HA_SPATIAL) ?
|
||||
"SPATIAL" :
|
||||
(table->key_info[key_number].algorithm == HA_KEY_ALG_RTREE) ?
|
||||
"RTREE" :
|
||||
"BTREE");
|
||||
}
|
||||
|
||||
|
||||
int ha_myisammrg::open(const char *name, int mode, uint test_if_locked)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue