diff options
| author | unknown <serg@sergbook.mysql.com> | 2003-04-23 15:44:39 +0400 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2003-04-23 15:44:39 +0400 |
| commit | 01c341f603c37f6a29d979c3f85be7b01999e2db (patch) | |
| tree | 77d6919fed33367fdbbc9be69c2422b18bc0d16b /sql/sql_table.cc | |
| parent | 2a61adce27f5043b6e10aa1cc9b55b8bb8f130fe (diff) | |
| download | mariadb-git-01c341f603c37f6a29d979c3f85be7b01999e2db.tar.gz | |
bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0cdb0a7ff48..0fbb5807c57 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -569,6 +569,14 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, column->field_name); DBUG_RETURN(-1); } + /* for fulltext keys keyseg length is 1 for blobs (it's ignored in + ft code anyway, and 0 (set to column width later) for char's. + it has to be correct col width for char's, as char data are not + prefixed with length (unlike blobs, where ft code takes data length + from a data prefix, ignoring column->length). + */ + if (key->type == Key::FULLTEXT) + column->length=test(f_is_blob(sql_field->pack_flag)); if (f_is_blob(sql_field->pack_flag)) { if (!(file->table_flags() & HA_BLOB_KEY)) @@ -579,15 +587,10 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, } if (!column->length) { - 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); - } + 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)) |