bk commit into 5.1 tree (holyfoot:1.2556)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of holyfoot.  When holyfoot 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, 2008-03-14 19:37:08+04:00, holyfoot@stripped +1 -0
  merging

  sql/item_geofunc.h@stripped, 2008-03-14 19:37:05+04:00, holyfoot@stripped +8 -2
    merging

diff -Nrup a/sql/item_geofunc.h b/sql/item_geofunc.h
--- a/sql/item_geofunc.h	2008-03-12 11:46:44 +04:00
+++ b/sql/item_geofunc.h	2008-03-14 19:37:05 +04:00
@@ -206,7 +206,10 @@ public:
   }
   enum Functype rev_functype() const { return spatial_rel; }
   const char *func_name() const;
-  void print(String *str) { Item_func::print(str); }
+  virtual inline void print(String *str, enum_query_type query_type)
+  {
+    Item_func::print(str, query_type);
+  }
   void fix_length_and_dec() { maybe_null= 1; }
   bool is_null() { (void) val_int(); return null_value; }
 };
@@ -265,7 +268,10 @@ public:
   virtual ~Item_func_spatial_operation();
   String *val_str(String *);
   const char *func_name() const;
-  void print(String *str) { Item_func::print(str); }
+  virtual inline void print(String *str, enum_query_type query_type)
+  {
+    Item_func::print(str, query_type);
+  }
 };