Fix for bug #805860 Second assertion Assertion `n > 0 && n <...

Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
        Just typo-style mistake. Should be '||' instead of '&&'.

per-file comments:
  mysql-test/r/gis-precise.result
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
        test result updated.
  mysql-test/t/gis-precise.test
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
        test case added.
  sql/item_geofunc.cc
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
        condition fixed.

mysql-test/t/gis-precise.test

@@ -151,3 +151,8 @@ SELECT ST_NUMGEOMETRIES((ST_UNION(ST_UNION(
                                        ((7 7,8 7,3 7,7 7,7 7)),
                                        ((0 5,3 5,3 4,1 4,1 3,3 3,3 0,0 0,0 5), (1 1,2 1,2 2,1 2,1 1)))'))));
 
+#bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sinco
+
+SELECT Round(ST_AREA(ST_BUFFER( ST_UNION(
+         POLYGONFROMTEXT('POLYGON((7 7, 7 7, 7 4, 7 7, 7 7))'),
+         POLYGONFROMTEXT('POLYGON((7 7, 4 7, 2 9, 7 6, 7 7))')), 1)), 6);

sql/item_geofunc.cc

@@ -1395,7 +1395,7 @@ int Item_func_buffer::Transporter::complete()
     }
     else
     {
-      if (x2 != x00 && y2 != y00)
+      if (x2 != x00 || y2 != y00)
       {
         if (add_edge_buffer(x00, y00, false, false))
           return 1;