diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-23 11:20:01 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-23 11:20:01 +0200 |
| commit | 6fec51dfba0af668582aa263f8c929236bd6ae98 (patch) | |
| tree | fba4b9c9b1268d8b0cc99f5faea0594efeedaa76 /sql/sql_table.cc | |
| parent | 825587388accab7f21fb4c117949853ad7206f73 (diff) | |
| parent | d74b5c983d978678151dec1d166e7d5668f0c808 (diff) | |
| download | mariadb-git-6fec51dfba0af668582aa263f8c929236bd6ae98.tar.gz | |
merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/russian/errmsg.txt:
merged (partially translated)
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 d76c6bbd627..9b718bb9179 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -424,6 +424,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++) { @@ -439,13 +448,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)) @@ -456,15 +460,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)) |