diff options
| author | unknown <wax@mysql.com> | 2004-09-16 00:50:05 +0600 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-09-16 00:50:05 +0600 |
| commit | 931f6da62289ae841e0ed599a787bb3c8569adc3 (patch) | |
| tree | 31bb48f00306602e2a0882f544cdf1fe365e94b7 /mysql-test/r/fulltext.result | |
| parent | 1460e454d066c928de8f95870c72a2515d8bbc79 (diff) | |
| parent | 7d94788c1ad489f57f339066396259941e05d577 (diff) | |
| download | mariadb-git-931f6da62289ae841e0ed599a787bb3c8569adc3.tar.gz | |
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
Diffstat (limited to 'mysql-test/r/fulltext.result')
| -rw-r--r-- | mysql-test/r/fulltext.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index 30c4c75f3d1..43f2e521cb0 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -352,9 +352,9 @@ t collation(t) aus Osnabrück utf8_general_ci SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrueck'); t collation(t) -SELECT t, collation(t),MATCH t AGAINST ('Osnabruck') FROM t1 WHERE MATCH t AGAINST ('Osnabruck'); -t collation(t) MATCH t AGAINST ('Osnabruck') -aus Osnabrück utf8_general_ci 1.591139793396 +SELECT t, collation(t),FORMAT(MATCH t AGAINST ('Osnabruck'),6) FROM t1 WHERE MATCH t AGAINST ('Osnabruck'); +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; SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrück'); t collation(t) |