bzr commit into mysql-5.1-bugteam branch (Alexey.Kopytov:2799)

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/mysql-5.1-bugteam/ based on revid:patrick.crews@stripped

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

=== 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;