SRID support.

GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.


myisam/sp_key.c:
  SRID support.
mysql-test/r/gis.result:
  We should use GeometryFromWKB().
mysql-test/t/gis.test:
  We should use GeometryFromWKB().
sql/field.cc:
  SRID support.
  ::store() methods for Field_geom.
  Code cleanup.
sql/field.h:
  SRID support.
  ::store() methods for Field_geom.
  Code cleanup.
sql/item_cmpfunc.cc:
  SRID support.
  Code cleanup.
sql/item_create.cc:
  Code cleanup.
sql/item_create.h:
  Code cleanup.
sql/item_func.cc:
  SRID support.
  Code cleanup.
sql/item_func.h:
  SRID support.
sql/item_strfunc.cc:
  SRID support.
  GeometryFromWKB() function.
  Code cleanup.
sql/item_strfunc.h:
  SRID support.
  GeometryFromWKB() function.
  Code cleanup.
sql/lex.h:
  GeometryFromWKB() function.
  SRID() function.
sql/spatial.cc:
  Code cleanup.
sql/spatial.h:
  Code cleanup.
sql/sql_yacc.yy:
  Fix for xxxFromText() functions.
  GeometryFromWKB() function.

1 files changed, 37 insertions, 37 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index d90c708fc0f..eff0c8ab137 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -480,157 +480,157 @@ Item *create_func_quote(Item* a)
   return new Item_func_quote(a);
 }
 
-Item *create_func_geometry_from_text(Item* a)
+Item *create_func_as_text(Item *a)
 {
-  return new Item_func_geometry_from_text(a);
+  return new Item_func_as_text(a);
 }
 
-Item *create_func_as_text(Item* a)
+Item *create_func_srid(Item *a)
 {
-  return new Item_func_as_text(a);
+  return new Item_func_srid(a);
 }
 
-Item *create_func_startpoint(Item* a)
+Item *create_func_startpoint(Item *a)
 {
   return new Item_func_spatial_decomp(a, Item_func::SP_STARTPOINT);
 }
 
-Item *create_func_endpoint(Item* a)
+Item *create_func_endpoint(Item *a)
 {
   return new Item_func_spatial_decomp(a, Item_func::SP_ENDPOINT);
 }
 
-Item *create_func_exteriorring(Item* a)
+Item *create_func_exteriorring(Item *a)
 {
   return new Item_func_spatial_decomp(a, Item_func::SP_EXTERIORRING);
 }
 
-Item *create_func_pointn(Item* a, Item* b)
+Item *create_func_pointn(Item *a, Item *b)
 {
-  return new Item_func_spatial_decomp_n(a,b,Item_func::SP_POINTN);
+  return new Item_func_spatial_decomp_n(a, b, Item_func::SP_POINTN);
 }
 
-Item *create_func_interiorringn(Item* a, Item* b)
+Item *create_func_interiorringn(Item *a, Item *b)
 {
-  return new Item_func_spatial_decomp_n(a,b,Item_func::SP_INTERIORRINGN);
+  return new Item_func_spatial_decomp_n(a, b, Item_func::SP_INTERIORRINGN);
 }
 
-Item *create_func_geometryn(Item* a, Item* b)
+Item *create_func_geometryn(Item *a, Item *b)
 {
-  return new Item_func_spatial_decomp_n(a,b,Item_func::SP_GEOMETRYN);
+  return new Item_func_spatial_decomp_n(a, b, Item_func::SP_GEOMETRYN);
 }
 
-Item *create_func_centroid(Item* a)
+Item *create_func_centroid(Item *a)
 {
   return new Item_func_centroid(a);
 }
 
-Item *create_func_envelope(Item* a)
+Item *create_func_envelope(Item *a)
 {
   return new Item_func_envelope(a);
 }
 
-Item *create_func_equals(Item* a, Item* b)
+Item *create_func_equals(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_EQUALS_FUNC);
 }
 
-Item *create_func_disjoint(Item* a, Item* b)
+Item *create_func_disjoint(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_DISJOINT_FUNC);
 }
 
-Item *create_func_intersects(Item* a, Item* b)
+Item *create_func_intersects(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_INTERSECTS_FUNC);
 }
 
-Item *create_func_touches(Item* a, Item* b)
+Item *create_func_touches(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_TOUCHES_FUNC);
 }
 
-Item *create_func_crosses(Item* a, Item* b)
+Item *create_func_crosses(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_CROSSES_FUNC);
 }
 
-Item *create_func_within(Item* a, Item* b)
+Item *create_func_within(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_WITHIN_FUNC);
 }
 
-Item *create_func_contains(Item* a, Item* b)
+Item *create_func_contains(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_CONTAINS_FUNC);
 }
 
-Item *create_func_overlaps(Item* a, Item* b)
+Item *create_func_overlaps(Item *a, Item *b)
 {
   return new Item_func_spatial_rel(a, b, Item_func::SP_OVERLAPS_FUNC);
 }
 
-Item *create_func_isempty(Item* a)
+Item *create_func_isempty(Item *a)
 {
   return new Item_func_isempty(a);
 }
 
-Item *create_func_issimple(Item* a)
+Item *create_func_issimple(Item *a)
 {
   return new Item_func_issimple(a);
 }
 
-Item *create_func_isclosed(Item* a)
+Item *create_func_isclosed(Item *a)
 {
   return new Item_func_isclosed(a);
 }
 
-Item *create_func_geometry_type(Item* a)
+Item *create_func_geometry_type(Item *a)
 {
   return new Item_func_geometry_type(a);
 }
 
-Item *create_func_dimension(Item* a)
+Item *create_func_dimension(Item *a)
 {
   return new Item_func_dimension(a);
 }
 
-Item *create_func_x(Item* a)
+Item *create_func_x(Item *a)
 {
   return new Item_func_x(a);
 }
 
-Item *create_func_y(Item* a)
+Item *create_func_y(Item *a)
 {
   return new Item_func_y(a);
 }
 
-Item *create_func_numpoints(Item* a)
+Item *create_func_numpoints(Item *a)
 {
   return new Item_func_numpoints(a);
 }
 
-Item *create_func_numinteriorring(Item* a)
+Item *create_func_numinteriorring(Item *a)
 {
   return new Item_func_numinteriorring(a);
 }
 
-Item *create_func_numgeometries(Item* a)
+Item *create_func_numgeometries(Item *a)
 {
   return new Item_func_numgeometries(a);
 }
 
-Item *create_func_area(Item* a)
+Item *create_func_area(Item *a)
 {
   return new Item_func_area(a);
 }
 
-Item *create_func_glength(Item* a)
+Item *create_func_glength(Item *a)
 {
   return new Item_func_glength(a);
 }
 
-Item *create_func_point(Item* a, Item* b)
+Item *create_func_point(Item *a, Item *b)
 {
-  return new Item_func_point(a,b);
+  return new Item_func_point(a, b);
 }