diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-15 11:00:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-15 11:00:35 -0600 |
| commit | f1f2ffcd0f45a957af217413c87eb4061e480692 (patch) | |
| tree | 993dd4ef4b73bf6fb7507f208aa766bc528400e9 /sql/ha_myisam.h | |
| parent | 845fd45a21fd9e8de5cd39f4c65b6d1b9c1396e9 (diff) | |
| parent | 5ed90531405b116444d1f3443369f1a6b1a2c2b4 (diff) | |
| download | mariadb-git-f1f2ffcd0f45a957af217413c87eb4061e480692.tar.gz | |
merge of conflicts
sql/ha_myisam.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/ha_myisam.h')
| -rw-r--r-- | sql/ha_myisam.h | 2 |
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; } |