diff options
| author | serg@serg.mysql.com <> | 2001-10-23 10:54:12 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-10-23 10:54:12 +0200 |
| commit | 565fe1805b5746a845888bd61033b064f7b1286f (patch) | |
| tree | b3064f15eee53d0ff97d9877fadf42f4ab8bd224 /sql/sql_table.cc | |
| parent | 0f25a1a0322e2d9e86e563d692c3be39534961d9 (diff) | |
| parent | 6f669e6bf8286a00eec272fb2ff1139be71892d4 (diff) | |
| download | mariadb-git-565fe1805b5746a845888bd61033b064f7b1286f.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4235faef6ca..f2ef9d02bab 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -413,6 +413,15 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, key_info->key_parts=(uint8) key->columns.elements; key_info->key_part=key_part_info; + if (key->type == Key::FULLTEXT) + { + if (file->option_flag() & HA_NO_FULLTEXT_KEY) + { + my_error(ER_TABLE_CANT_HANDLE_FULLTEXT, MYF(0)); + DBUG_RETURN(-1); + } + } + List_iterator<key_part_spec> cols(key->columns); for (uint column_nr=0 ; (column=cols++) ; column_nr++) { @@ -428,13 +437,8 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, column->field_name); DBUG_RETURN(-1); } - if (key->type == Key::FULLTEXT && - (file->option_flag() & HA_NO_FULLTEXT_KEY)) - { - my_printf_error(ER_WRONG_KEY_COLUMN, ER(ER_WRONG_KEY_COLUMN), MYF(0), - 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)) @@ -445,15 +449,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)) |