bzr push into mysql-5.1-bugteam branch (Alexey.Kopytov:2798 to 2800)

[Alexey Kopytov]

 2800 Alexey Kopytov	2009-02-15
      Take additional precision into account
      modified:
        mysql-test/suite/funcs_1/r/ndb_func_view.result
        mysql-test/suite/funcs_1/r/ndb_views.result

 2799 Alexey Kopytov	2009-02-15 [merge]
      Automerge.
      modified:
        mysql-test/t/gis.test

 2798 Patrick Crews	2009-02-14 [merge]
      automerge
      modified:
        client/sql_string.cc
        libmysql/libmysql.c
        mysql-test/r/archive_gis.result
        mysql-test/r/func_group.result
        mysql-test/r/func_math.result
        mysql-test/r/func_str.result
        mysql-test/r/gis.result
        mysql-test/r/innodb_gis.result
        mysql-test/r/parser.result
        mysql-test/r/select.result
        mysql-test/r/sp.result
        mysql-test/r/type_float.result
        mysql-test/suite/funcs_1/r/memory_func_view.result
        mysql-test/suite/funcs_1/r/memory_views.result
        mysql-test/suite/funcs_1/r/myisam_func_view.result
        mysql-test/suite/funcs_1/r/myisam_views.result
        mysql-test/suite/ndb/r/ndb_gis.result
        mysql-test/t/type_float.test
        sql/handler.cc
        sql/mysql_priv.h
        sql/sql_string.cc

=== modified file 'mysql-test/suite/funcs_1/r/ndb_func_view.result'
--- a/mysql-test/suite/funcs_1/r/ndb_func_view.result	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result	2009-02-15 11:11:50 +0000
@@ -5245,7 +5245,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
@@ -5259,7 +5259,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6

=== modified file 'mysql-test/suite/funcs_1/r/ndb_views.result'
--- a/mysql-test/suite/funcs_1/r/ndb_views.result	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2009-02-15 11:11:50 +0000
@@ -22824,7 +22824,7 @@ f1	f2
 ABC	3
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
+ABC	1.73205080756888
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
@@ -22842,7 +22842,7 @@ ABC	DEF
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.7320508075689
+ABC	1.73205080756888
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
@@ -22862,7 +22862,7 @@ my_sqrt	double	YES		NULL	
 SELECT * FROM v2 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.7320508075689
+ABC	1.73205080756888
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 SELECT * FROM t2 order by 2;
 f1	ABC

=== modified file 'mysql-test/t/gis.test'
--- a/mysql-test/t/gis.test	2008-02-28 11:21:44 +0000
+++ b/mysql-test/t/gis.test	2009-02-15 09:47:04 +0000
@@ -356,6 +356,9 @@ insert into t1 values ('85984',GeomFromT
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85998;
 
+# Expected result is 36.3310176346905, but IA64 returns 36.3310176346904
+# due to fused multiply-add instructions.
+--replace_result 36.3310176346904 36.3310176346905
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85984;