diff options
| author | unknown <bar@mysql.com> | 2004-06-11 16:29:16 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-06-11 16:29:16 +0500 |
| commit | 5275eb21c25eef0c5b799315da10f26b779fbfe9 (patch) | |
| tree | 72245220b637b8d5caf3b8267ea6801af59f0bc7 /sql/sql_table.cc | |
| parent | 4047b5ade3b02d73c60eac7ddae7e5e928de7fd3 (diff) | |
| download | mariadb-git-5275eb21c25eef0c5b799315da10f26b779fbfe9.tar.gz | |
Allocate memory when a character set is requested:
- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index aea6140226c..dc838f0e685 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -858,7 +858,7 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, sql_field->sql_type != FIELD_TYPE_VAR_STRING && !f_is_blob(sql_field->pack_flag)) || sql_field->charset == &my_charset_bin || - sql_field->charset->state & MY_CS_NONTEXT || // ucs2 doesn't work yet + sql_field->charset->mbminlen > 1 || // ucs2 doesn't work yet (ft_key_charset && sql_field->charset != ft_key_charset)) { my_printf_error(ER_BAD_FT_COLUMN,ER(ER_BAD_FT_COLUMN),MYF(0), |