bk commit into 4.1 tree (hf:1.2434)

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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.2434 05/10/31 12:05:27 hf@deer.(none) +2 -0
  Additional fix for #12839

  sql/spatial.cc
    1.22 05/10/31 12:00:57 hf@deer.(none) +9 -9
    small syntax fixes

  sql/field.cc
    1.226 05/10/31 12:00:57 hf@deer.(none) +1 -2
    This code still could work for VERY out-of-dated databases

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.12839

--- 1.225/sql/field.cc	Wed Sep 21 14:34:17 2005
+++ 1.226/sql/field.cc	Mon Oct 31 12:00:57 2005
@@ -5745,8 +5745,7 @@
       return;
     }
     get_ptr(&blob);
-    gobj= Geometry::construct(&buffer,
-                              blob + SRID_SIZE, blob_length - SRID_SIZE);
+    gobj= Geometry::construct(&buffer, blob, blob_length);
     if (gobj->get_mbr(&mbr, &dummy))
       bzero(buff, SIZEOF_STORED_DOUBLE*4);
     else

--- 1.21/sql/spatial.cc	Wed Sep 21 14:34:17 2005
+++ 1.22/sql/spatial.cc	Mon Oct 31 12:00:57 2005
@@ -224,10 +224,10 @@
       res->reserve(WKB_HEADER_SIZE, 512))
     return 1;
 
-  res->q_append((char)wkb_ndr);
+  res->q_append((char) wkb_ndr);
   res->q_append(geom_type);
   return geom->init_from_wkb(wkb+WKB_HEADER_SIZE, len - WKB_HEADER_SIZE,
-                             (wkbByteOrder)wkb[0], res);
+                             (wkbByteOrder) wkb[0], res);
 }
 
 
@@ -689,7 +689,7 @@
 	trs->check_next_symbol(')'))
       return 1;
 
-    ls.set_data_ptr(wkb->ptr()+ls_pos, wkb->length()-ls_pos);
+    ls.set_data_ptr(wkb->ptr() + ls_pos, wkb->length() - ls_pos);
     if (ls.is_closed(&closed) || !closed)
     {
       trs->set_error_msg("POLYGON's linear ring isn't closed");
@@ -730,7 +730,7 @@
     if (!(ls_len= ls.init_from_wkb(wkb, len, bo, res)))
       return 0;
 
-    ls.set_data_ptr(res->ptr()+ls_pos, res->length()-ls_pos);
+    ls.set_data_ptr(res->ptr() + ls_pos, res->length() - ls_pos);
 
     if (ls.is_closed(&closed) || !closed)
       return 0;
@@ -1052,7 +1052,7 @@
     res->q_append((char)wkb_ndr);
     res->q_append((uint32)wkb_point);
     if (!p.init_from_wkb(wkb + WKB_HEADER_SIZE,
-                         POINT_DATA_SIZE, (wkbByteOrder)wkb[0], res))
+                         POINT_DATA_SIZE, (wkbByteOrder) wkb[0], res))
       return 0;
   }
   return proper_size;
@@ -1195,7 +1195,7 @@
     res->q_append((uint32) wkb_linestring);
 
     if (!(ls_len= ls.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                   (wkbByteOrder)wkb[0], res)))
+                                   (wkbByteOrder) wkb[0], res)))
       return 0;
     wkb+= (ls_len + WKB_HEADER_SIZE);
     len-= (ls_len + WKB_HEADER_SIZE);
@@ -1446,7 +1446,7 @@
     res->q_append((uint32) wkb_polygon);
 
     if (!(p_len= p.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                 (wkbByteOrder)wkb[0], res)))
+                                 (wkbByteOrder) wkb[0], res)))
       return 0;
     wkb+= (p_len + WKB_HEADER_SIZE);
     len-= (p_len + WKB_HEADER_SIZE);
@@ -1743,12 +1743,12 @@
       return 0;
 
     res->q_append((char) wkb_ndr);
-    wkb_type= wkb_get_uint(wkb+1, (wkbByteOrder)wkb[0]);
+    wkb_type= wkb_get_uint(wkb+1, (wkbByteOrder) wkb[0]);
     res->q_append(wkb_type);
 
     if (!(geom= create_by_typeid(&buffer, wkb_type)) ||
         !(g_len= geom->init_from_wkb(wkb + WKB_HEADER_SIZE, len,
-                                     (wkbByteOrder)wkb[0], res)))
+                                     (wkbByteOrder)  wkb[0], res)))
       return 0;
     wkb+= (g_len + WKB_HEADER_SIZE);
     len-= (g_len + WKB_HEADER_SIZE);