1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge serg.mysql.com:/usr/home/serg/Abk/mysql

Browse Source 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown 2001-10-24 14:59:50 +02:00
commit 8f5e9a1e89
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_table.cc
View File

@ -448,8 +448,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
column->field_name); column->field_name);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
if (key->type == Key::FULLTEXT)
column->length=1; /* ft-code ignores it anyway :-) */
if (f_is_blob(sql_field->pack_flag)) if (f_is_blob(sql_field->pack_flag))
{ {
if (!(file->option_flag() & HA_BLOB_KEY)) if (!(file->option_flag() & HA_BLOB_KEY))
@ -460,10 +458,15 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
} }
if (!column->length) if (!column->length)
{ {
my_printf_error(ER_BLOB_KEY_WITHOUT_LENGTH, if (key->type == Key::FULLTEXT)
ER(ER_BLOB_KEY_WITHOUT_LENGTH),MYF(0), column->length=1; /* ft-code ignores it anyway :-) */
column->field_name); else
DBUG_RETURN(-1); {
my_printf_error(ER_BLOB_KEY_WITHOUT_LENGTH,
ER(ER_BLOB_KEY_WITHOUT_LENGTH),MYF(0),
column->field_name);
DBUG_RETURN(-1);
}
} }
} }
if (!(sql_field->flags & NOT_NULL_FLAG)) if (!(sql_field->flags & NOT_NULL_FLAG))