diff options
| author | unknown <serg@serg.mylan> | 2003-10-20 15:53:48 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-20 15:53:48 +0200 |
| commit | 228f4a43a353e9e7c56e1a617749fc9c0e875f6d (patch) | |
| tree | ff0f9b71c43cfc4ed4e2fa91a8398677dae7377a /sql/sql_table.cc | |
| parent | 4a253d2af04869a3e28831b71ddbc5d78279fe5e (diff) | |
| download | mariadb-git-228f4a43a353e9e7c56e1a617749fc9c0e875f6d.tar.gz | |
FULLTEXT: correct charset support (UTF included, UCS2 - not)
code cleanup
include/m_ctype.h:
my_mbcharlen_8bit() { return 1 }
mysql-test/r/fulltext.result:
fulltext on UTF
mysql-test/t/fulltext.test:
fulltext on UTF
sql/item_cmpfunc.h:
cleanup
sql/sql_table.cc:
FULLTEXT: UCS2 is not allowed
sql/sql_yacc.yy:
FULLTEXT: code cleanup
strings/ctype-bin.c:
my_mbcharlen_8bit() { return 1 }
strings/ctype-latin1.c:
my_mbcharlen_8bit() { return 1 }
strings/ctype-simple.c:
my_mbcharlen_8bit() { return 1 }
strings/ctype-tis620.c:
my_mbcharlen_8bit() { return 1 }
strings/ctype-utf8.c:
hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 46dc1191ef8..5112dfb59cd 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -733,6 +733,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, 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 (ft_key_charset && sql_field->charset != ft_key_charset)) { my_printf_error(ER_BAD_FT_COLUMN,ER(ER_BAD_FT_COLUMN),MYF(0), |