bk commit into 5.1 tree (holyfoot:1.2638)

[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-11-22 20:56:14+04:00, holyfoot@stripped +2 -0
  merging

  sql/item_geofunc.cc@stripped, 2007-11-22 20:56:12+04:00, holyfoot@stripped +0 -12
    merging

  sql/item_geofunc.h@stripped, 2007-11-22 20:56:12+04:00, holyfoot@stripped +0 -2
    merging

diff -Nrup a/sql/item_geofunc.cc b/sql/item_geofunc.cc
--- a/sql/item_geofunc.cc	2007-11-22 20:30:20 +04:00
+++ b/sql/item_geofunc.cc	2007-11-22 20:56:12 +04:00
@@ -740,12 +740,6 @@ exit:
 }
 
 
-int Item_func_spatial_operation::get_geometry_type() const
-{
-  return 0;
-}
-
-
 const char *Item_func_spatial_operation::func_name() const
 { 
   switch (spatial_op) {
@@ -1148,12 +1142,6 @@ mem_error:
   scan_it.reset();
   res_receiver.reset();
   DBUG_RETURN(str_result);
-}
-
-
-int Item_func_buffer::get_geometry_type() const
-{
-  return 0;
 }
 
 
diff -Nrup a/sql/item_geofunc.h b/sql/item_geofunc.h
--- a/sql/item_geofunc.h	2007-11-22 20:30:42 +04:00
+++ b/sql/item_geofunc.h	2007-11-22 20:56:12 +04:00
@@ -258,7 +258,6 @@ public:
   Item_func_spatial_operation(Item *a,Item *b, gcalc_function::op_type sp_op);
   virtual ~Item_func_spatial_operation();
   String *val_str(String *);
-  int get_geometry_type() const;
   const char *func_name() const;
   void print(String *str) { Item_func::print(str); }
 };
@@ -280,7 +279,6 @@ public:
     Item_geometry_func(obj, distance) {}
   const char *func_name() const { return "Buffer"; }
   String *val_str(String *);
-  int get_geometry_type() const;
 private:
   int add_edge_buffer(const gcalc_heap::info *p1, const gcalc_heap::info *p2, 
                       const gcalc_heap::info *p3, double d,