summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.h
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-09-15 11:00:35 -0600
committersasha@mysql.sashanet.com <>2000-09-15 11:00:35 -0600
commit44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2 (patch)
tree993dd4ef4b73bf6fb7507f208aa766bc528400e9 /sql/ha_myisam.h
parent0a087649ec06ff578f7b48e754e094c9cf26f664 (diff)
parent5d1388487646c5f607069b10c95539e5b1674df8 (diff)
downloadmariadb-git-44bc3f9b0e85ad10b47bfe5186e195a14dac8fe2.tar.gz
merge of conflicts
Diffstat (limited to 'sql/ha_myisam.h')
-rw-r--r--sql/ha_myisam.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index 00f63a99edd..274b927a0c7 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.h
@@ -45,7 +45,7 @@ class ha_myisam: public handler
const char **bas_ext() const;
ulong option_flag() const { return int_option_flag; }
uint max_record_length() const { return HA_MAX_REC_LENGTH; }
- uint max_keys() const { return 1; }
+ uint max_keys() const { return MI_MAX_KEY; }
uint max_key_parts() const { return MAX_REF_PARTS; }
uint max_key_length() const { return MAX_KEY_LENGTH; }