FULLTEXT: correct charset support (UTF included, UCS2 - not)

code cleanup

1 files changed, 21 insertions, 0 deletions

diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 87416ae97eb..63338869fdd 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -279,3 +279,24 @@ select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('
 t1_id	name	t2_id	t1_id	name
 1	data1	1	1	xxfoo
 drop table t1,t2;
+SET NAMES latin1;
+CREATE TABLE t1 (t text character set utf8 not null, fulltext(t));
+INSERT t1 VALUES ('Mit freundlichem Grüß'), ('aus Osnabrück');
+SET NAMES koi8r;
+INSERT t1 VALUES ("üÔÏ ÍÙ - ÏÐÉÌËÉ"),("ïÔÌÅÚØ, ÇÎÉÄÁ!"),
+("îÅ ×ÌÅÚÁÊ, ÕÂØÅÔ!"),("É ÂÕÄÅÔ ÐÒÁ×!");
+SELECT t, charset(t) FROM t1 WHERE MATCH t AGAINST ('ïðéìëé');
+t	charset(t)
+üÔÏ ÍÙ - ÏÐÉÌËÉ	utf8
+SELECT t, charset(t) FROM t1 WHERE MATCH t AGAINST ('ðÒá*' IN BOOLEAN MODE);
+t	charset(t)
+É ÂÕÄÅÔ ÐÒÁ×!	utf8
+SELECT * FROM t1 WHERE MATCH t AGAINST ('ÜÔÏ' IN BOOLEAN MODE);
+t
+SELECT t, charset(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrück');
+t	charset(t)
+SET NAMES latin1;
+SELECT t, charset(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrück');
+t	charset(t)
+aus Osnabrück	utf8
+DROP TABLE t1;