diff options
| author | monty@mysql.com <> | 2004-11-08 17:53:32 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-08 17:53:32 +0200 |
| commit | 10871866578b68a656057797db9ac8f08418238a (patch) | |
| tree | 8b26ea79c2cf98b50f42ec02a9c92e62c98f6276 /mysql-test/r/fulltext.result | |
| parent | 401ede54b71028c5b4cb85a0a7deb520f5ed989d (diff) | |
| parent | 4fbf62e6c2a8dd51c9bcaea13ab92af5cbff7961 (diff) | |
| download | mariadb-git-10871866578b68a656057797db9ac8f08418238a.tar.gz | |
Merge with 4.1 to get new thd->mem_root handling
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 ba2403bac21..1f2ae96d8f6 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -355,9 +355,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; Warnings: Warning 1265 Data truncated for column 't' at row 3 |