diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-22 16:48:35 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-22 16:48:35 +0100 |
| commit | 7e78842adfece3314e809c09f62cbfa018e3cae5 (patch) | |
| tree | 9cfe8e5f63a4b3a48630094199de84f94d20876d /mysql-test/r/fulltext.result | |
| parent | 0adda6df52f00ddd9533bd956f39bbf9ef80360e (diff) | |
| parent | d4eeb4eefdbb8ccfc2b7a22e5dd53efda8ff31a6 (diff) | |
| download | mariadb-git-7e78842adfece3314e809c09f62cbfa018e3cae5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_newdecimal.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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index d5af37c0fec..fe86f20fe22 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -460,12 +460,12 @@ t1 CREATE TABLE `t1` ( DROP TABLE t1; CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a)); INSERT INTO t1 VALUES('test'),('test1'),('test'); -PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; +PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')"; EXECUTE stmt; -a MATCH(a) AGAINST('test1 test') -test1 0.68526661396027 +a FORMAT(MATCH(a) AGAINST('test1 test'),6) +test1 0.685267 EXECUTE stmt; -a MATCH(a) AGAINST('test1 test') -test1 0.68526661396027 +a FORMAT(MATCH(a) AGAINST('test1 test'),6) +test1 0.685267 DEALLOCATE PREPARE stmt; DROP TABLE t1; |