diff options
| author | bar@bar.intranet.mysql.r18.ru <> | 2006-11-01 16:48:03 +0400 |
|---|---|---|
| committer | bar@bar.intranet.mysql.r18.ru <> | 2006-11-01 16:48:03 +0400 |
| commit | cefa1cf9e03c1afed92ac61152b3eac2479167bd (patch) | |
| tree | 05bd541c3b5ac58466925f5a05817fec19097049 /mysql-test/r/fulltext.result | |
| parent | c9b963cfcdb4f9200f279c008e6b3056290cd38d (diff) | |
| parent | 0e3a1eece7289c56bb653f25523d4518ba694452 (diff) | |
| download | mariadb-git-cefa1cf9e03c1afed92ac61152b3eac2479167bd.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
into mysql.com:/usr/home/bar/mysql-5.1-rpl
Diffstat (limited to 'mysql-test/r/fulltext.result')
| -rw-r--r-- | mysql-test/r/fulltext.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index 457155b4299..829cf25a896 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -381,10 +381,10 @@ t collation(t) FORMAT(MATCH t AGAINST ('Osnabruck'),6) aus Osnabrück utf8_general_ci 1.591140 alter table t1 modify t varchar(200) collate latin1_german2_ci not null; Warnings: -Warning 1265 Data truncated for column 't' at row 3 -Warning 1265 Data truncated for column 't' at row 4 -Warning 1265 Data truncated for column 't' at row 5 -Warning 1265 Data truncated for column 't' at row 6 +Warning 1366 Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column 't' at row 3 +Warning 1366 Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column 't' at row 4 +Warning 1366 Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column 't' at row 5 +Warning 1366 Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column 't' at row 6 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrück'); t collation(t) aus Osnabrück latin1_german2_ci |