database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/pem/work/mysql-4.1

Browse Source 
into mysql.com:/home/pem/work/mysql-5.0-merge
This commit is contained in:
pem@mysql.com
2004-02-13 17:39:00 +01:00
parent f9e73c7716 d0b456fead
commit 5faf244b30
30 changed files with 642 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_table.cc
View File

@ -873,7 +873,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 &&