diff options
| author | serg@serg.mysql.com <> | 2001-10-24 20:17:46 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-10-24 20:17:46 +0200 |
| commit | 7b3263dfe0a6b1a71a240306b169dbc7cddcb66d (patch) | |
| tree | 1fc7bb946de9e9059f850ccbc3cf1850a6156295 | |
| parent | 665ece680f2a544812eee00ab2ee51ab7f6bf044 (diff) | |
| parent | 5fd23197e839ca53f269f6540a50dd4ac2f2f586 (diff) | |
| download | mariadb-git-7b3263dfe0a6b1a71a240306b169dbc7cddcb66d.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| -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)) |