Commit b2fec887 authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
parents 2885d0df 2034df15

sql/item.cc

+4 −0
Original line number Diff line number Diff line
@@ -4363,12 +4363,14 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table) 
      return new Field_blob(max_length, maybe_null, name, table,

                          collation.collation);

    break;					// Blob handled outside of case

#ifdef HAVE_SPATIAL

  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()));

#endif /* HAVE_SPATIAL */

  }

}
@@ -6488,10 +6490,12 @@ Item_type_holder::Item_type_holder(THD *thd, Item *item) 
  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();

#endif /* HAVE_SPATIAL */

}

sql/set_var.cc

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ sys_var *sys_variables[]= 
  &sys_innodb_max_purge_lag,

  &sys_innodb_table_locks,

  &sys_innodb_support_xa,

  &sys_innodb_max_purge_lag,

  &sys_innodb_autoextend_increment,

  &sys_innodb_sync_spin_loops,

  &sys_innodb_concurrency_tickets,