diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-01 16:48:03 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-01 16:48:03 +0400 |
| commit | bfdc9c120792c412e7cbb03b071616aaf899599a (patch) | |
| tree | 05bd541c3b5ac58466925f5a05817fec19097049 /mysql-test/r/fulltext.result | |
| parent | a78bdf82250f771f35aa35210da2b7729bbe9b05 (diff) | |
| parent | 00c1c19e9410a942ed7b2b49e7dc7916a9d8010f (diff) | |
| download | mariadb-git-bfdc9c120792c412e7cbb03b071616aaf899599a.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
into mysql.com:/usr/home/bar/mysql-5.1-rpl
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/strict_autoinc_1myisam.result:
Auto merged
mysql-test/r/strict_autoinc_2innodb.result:
Auto merged
mysql-test/r/strict_autoinc_3heap.result:
Auto merged
mysql-test/r/strict_autoinc_4bdb.result:
Auto merged
mysql-test/r/strict_autoinc_5ndb.result:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/field.cc:
SCCS merged
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 |