bk commit into 5.0 tree (dkatz:1.2524) BUG#29772

Below is the list of changes that have just been committed into a local 5.0 repository of dkatz. When dkatz 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.2524, 2007-09-28 17:10:14-04:00, dkatz@damien-katzs-computer.local +1 -0   Bug #29772 Error compiling with option --without-geometry   

  Added #ifdef HAVE_SPATIAL around geometry related code.

  sql/item.cc@1.282, 2007-09-28 17:10:06-04:00, dkatz@damien-katzs-computer.local +4 -0     Added #ifdef HAVE_SPATIAL around geometry related code.

diff -Nrup a/sql/item.cc b/sql/item.cc

--- a/sql/item.cc	2007-08-20 16:09:20 -04:00
+++ b/sql/item.cc	2007-09-28 17:10:06 -04:00
@@ -4357,12 +4357,14 @@ Field *Item::tmp_table_field_from_field_
       return new Field_blob(max_length, maybe_null, name, table,
                           collation.collation);
     break;					// Blob handled outside of case

   case MYSQL_TYPE_GEOMETRY:

     return new Field_geom(max_length, maybe_null, name, table,
                           (Field::geometry_type)
                           ((type() == Item::TYPE_HOLDER) ?
                            ((Item_type_holder *)this)->get_geometry_type() :
                            ((Item_geometry_func *)this)->get_geometry_type()));

   }
 }  

@@ -6482,10 +6484,12 @@ Item_type_holder::Item_type_holder(THD *

Do you need help?

In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software: Learn more about Pantek's Technical Support offerings Place an order for 24/7/365 Technical Support here Learn more about Pantek, who we are, and what we do Chat with a Live Operator Related lists.mysql.com Links announce benchmarks bugs certification cluster commits dotnet gui-tools internals java maxdb myodbc mysql mysqldoc packagers perl plusplus replication win32 Request more information about Pantek

   if (Field::result_merge_type(fld_type) == INT_RESULT)      decimals= 0;
   prev_decimal_int_part= item->decimal_int_part();
+#ifdef HAVE_SPATIAL

   if (item->field_type() == MYSQL_TYPE_GEOMETRY)

     geometry_type= (item->type() == Item::FIELD_ITEM) ?
       ((Item_field *)item)->get_geometry_type() :
       (Field::geometry_type)((Item_geometry_func *)item)->get_geometry_type();

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com