summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.h
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2004-12-27 14:05:35 +0200
committerunknown <timour@mysql.com>2004-12-27 14:05:35 +0200
commitb4c61152d3e30d9dca00d702053264bc4a610c73 (patch)
tree6c2c972b53853b7681cacae710b29789006db5ee /sql/ha_myisammrg.h
parent1548c6b765464ef05c12fd0147819e1b35791bf3 (diff)
downloadmariadb-git-b4c61152d3e30d9dca00d702053264bc4a610c73.tar.gz
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.
Diffstat (limited to 'sql/ha_myisammrg.h')
-rw-r--r--sql/ha_myisammrg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index 264c580220c..6058c32c805 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
@@ -32,6 +32,7 @@ class ha_myisammrg: public handler
~ha_myisammrg() {}
const char *table_type() const { return "MRG_MyISAM"; }
const char **bas_ext() const;
+ const char *index_type(uint key_number);
ulong table_flags() const
{
return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME |