summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-09-10 21:40:01 +0200
committerunknown <serg@sergbook.mysql.com>2002-09-10 21:40:01 +0200
commit80bc840f53b34090106e694769a3a316290c6b60 (patch)
treef6046d93ce37f0e80f7537f352e3da3790a3b2d6 /sql/sql_table.cc
parenta106f9ea4329b6c54ade14862ffc3f6f9f628c70 (diff)
downloadmariadb-git-80bc840f53b34090106e694769a3a316290c6b60.tar.gz
max_key_length MyISAM bugfix
myisam/mi_create.c: check for MI_MAX_KEY_LENGTH in mi_create() sql/sql_table.cc: fix obvious typo
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 0482313481d..021f3f07ad5 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -627,7 +627,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
if (!(key_info->flags & HA_NULL_PART_KEY))
unique_key=1;
key_info->key_length=(uint16) key_length;
- uint max_key_length= max(file->max_key_length(), MAX_KEY_LENGTH);
+ uint max_key_length= min(file->max_key_length(), MAX_KEY_LENGTH);
if (key_length > max_key_length && key->type != Key::FULLTEXT)
{
my_error(ER_TOO_LONG_KEY,MYF(0),max_key_length);