bk commit into 5.1 tree (holyfoot:1.2514)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2007-05-30 15:34:41+05:00, holyfoot@stripped +3 -0
  merging

  BitKeeper/etc/ignore@stripped, 2007-05-30 15:34:38+05:00, holyfoot@stripped +2 -0
    Added libmysqld/gcalc_slicescan.cc libmysqld/gcalc_tools.cc to the ignore list

  sql/item_geofunc.cc@stripped, 2007-05-30 15:34:38+05:00, holyfoot@stripped +3 -0
    merging

  sql/spatial.h@stripped, 2007-05-30 15:34:38+05:00, holyfoot@stripped +2 -2
    merging

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/mysql-5.1.spa

--- 1.28/sql/spatial.h	2007-05-30 15:34:46 +05:00
+++ 1.29/sql/spatial.h	2007-05-30 15:34:46 +05:00
@@ -283,8 +283,8 @@ public:
   static Geometry *create_from_wkt(Geometry_buffer *buffer,
 				   Gis_read_stream *trs, String *wkt,
 				   bool init_stream=1);
-  static int create_from_wkb(Geometry_buffer *buffer,
-                             const char *wkb, uint32 len, String *res);
+  static Geometry *create_from_wkb(Geometry_buffer *buffer,
+                                   const char *wkb, uint32 len, String *res);
   static int create_from_opresult(Geometry_buffer *g_buf,
                                   String *res, gcalc_result_receiver &rr);
   int as_wkt(String *wkt, const char **end)

--- 1.35/sql/item_geofunc.cc	2007-05-30 15:34:46 +05:00
+++ 1.36/sql/item_geofunc.cc	2007-05-30 15:34:46 +05:00
@@ -43,12 +43,15 @@ void Item_geometry_func::fix_length_and_
 
 bool Item_geometry_func::send(Protocol *protocol, String *str)
 {
+  return Item_str_func::send(protocol, str);
+/*
   String *res;
   if ((res=val_str(str)) == NULL)
     return protocol->store_null();
 
     result= protocol->store(res->ptr(),res->length(),res->charset());
   return result;
+*/
 }
 
 

--- 1.291/BitKeeper/etc/ignore	2007-05-30 15:34:46 +05:00
+++ 1.292/BitKeeper/etc/ignore	2007-05-30 15:34:46 +05:00
@@ -2990,3 +2990,5 @@ win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
 libmysqld/ha_ndbcluster_cond.cc
+libmysqld/gcalc_slicescan.cc
+libmysqld/gcalc_tools.cc