diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-24 14:59:50 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-24 14:59:50 +0200 |
| commit | 8f5e9a1e8954ac6ab05ff1b50bf3defbfe5f482c (patch) | |
| tree | dafb267fb26762d3648f06406d0db21d19dff034 /sql | |
| parent | 4bbbfc01d5e18c1265ad88afcd6f5256a57f3050 (diff) | |
| parent | d320ee1a9429e3dbe8e470b2eccbd3da39d2f8d8 (diff) | |
| download | mariadb-git-8f5e9a1e8954ac6ab05ff1b50bf3defbfe5f482c.tar.gz | |
Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9b718bb9179..a42c9d42746 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -448,8 +448,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, column->field_name); 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 (!(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) { - my_printf_error(ER_BLOB_KEY_WITHOUT_LENGTH, - ER(ER_BLOB_KEY_WITHOUT_LENGTH),MYF(0), - column->field_name); - DBUG_RETURN(-1); + if (key->type == Key::FULLTEXT) + column->length=1; /* ft-code ignores it anyway :-) */ + else + { + 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)) |