bk commit into 5.0 tree (msvensson:1.2063) BUG#18071

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2063 06/03/08 23:22:03 msvensson@shellback.(none) +2 -0
  Bug#18071 Result from MATCH() uses too many decimals
   - Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
   - This has been done before.

  mysql-test/t/fulltext.test
    1.81 06/03/08 23:21:57 msvensson@shellback.(none) +2 -1
    Use FORMAT to only output the first 6 decimals from MATCH

  mysql-test/r/fulltext.result
    1.85 06/03/08 23:21:57 msvensson@shellback.(none) +5 -5
    Use FORMAT to only output the first 6 decimals from MATCH

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug18071/my50-bug18071

--- 1.84/mysql-test/r/fulltext.result	2006-02-07 12:25:55 +01:00
+++ 1.85/mysql-test/r/fulltext.result	2006-03-08 23:21:57 +01:00
@@ -447,12 +447,12 @@
 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;

--- 1.80/mysql-test/t/fulltext.test	2006-02-07 12:26:23 +01:00
+++ 1.81/mysql-test/t/fulltext.test	2006-03-08 23:21:57 +01:00
@@ -371,7 +371,8 @@
 #
 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')";
+# Use FORMAT to only output the first 6 decimals from MATCH
+PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE
MATCH(a) AGAINST('test1 test')";
 EXECUTE stmt;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;