diff options
| author | unknown <wax@mysql.com> | 2004-11-04 21:25:49 +0500 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-11-04 21:25:49 +0500 |
| commit | a941f1486f909de627226f888cd15cb90ed9becc (patch) | |
| tree | ad6fdc58df19bf9bb503d896c0123667f40b56fe /mysql-test/r/fulltext.result | |
| parent | 02af97cc3431075b1b81826e6933251cf61cfb8e (diff) | |
| parent | 716e3a577c59e4b8a38270c02a69f0492f79c685 (diff) | |
| download | mariadb-git-a941f1486f909de627226f888cd15cb90ed9becc.tar.gz | |
autocommit
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/insert.test:
Auto merged
mysql-test/t/type_float.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 0a26f545ab0..e976cc95383 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 |