summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authortimour@mysql.com <>2004-12-27 14:05:35 +0200
committertimour@mysql.com <>2004-12-27 14:05:35 +0200
commit5eab756a6381da78e30b824f93894b2b86b05f92 (patch)
tree6c2c972b53853b7681cacae710b29789006db5ee /sql/ha_myisammrg.cc
parentf1fe6e178427bef9e4ac791e1ef4a9ae9be99d57 (diff)
downloadmariadb-git-5eab756a6381da78e30b824f93894b2b86b05f92.tar.gz
Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0.
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index bf4c2a36ffd..bf47b4625e0 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -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)
{