summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bar@bar.intranet.mysql.r18.ru>2004-02-13 17:58:02 +0400
committerunknown <bar@bar.intranet.mysql.r18.ru>2004-02-13 17:58:02 +0400
commit82364214ecdbc574328efab8e8661468c2ec5b16 (patch)
tree1331ade42114d964d8a8b57c0af8bad50b507d76 /sql
parentf03296b6dcc2680eceb8f289e1ed6ed4ecee2b8e (diff)
downloadmariadb-git-82364214ecdbc574328efab8e8661468c2ec5b16.tar.gz
Bug #2699 UTF8 breaks primary keys for cols > 85 characters
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_table.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 4e66154e2a2..404d2b56e06 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -877,7 +877,12 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
column->field_name);
DBUG_RETURN(-1);
}
- key_part_info->length=(uint8) length;
+ if (length > file->max_key_part_length())
+ {
+ my_error(ER_WRONG_SUB_KEY,MYF(0));
+ DBUG_RETURN(-1);
+ }
+ key_part_info->length=(uint16) length;
/* Use packed keys for long strings on the first column */
if (!(db_options & HA_OPTION_NO_PACK_KEYS) &&
(length >= KEY_DEFAULT_PACK_LENGTH &&