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, 32 insertions, 32 deletions

diff --git a/sql/item_create.h b/sql/item_create.h
index 135bd6b02c4..14812c47cdc 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -102,40 +102,40 @@ Item *create_load_file(Item* a);
 Item *create_func_is_free_lock(Item* a);
 Item *create_func_quote(Item* a);
 
-Item *create_func_geometry_from_text(Item* a);
-Item *create_func_as_text(Item* a);
-Item *create_func_startpoint(Item* a);
-Item *create_func_endpoint(Item* a);
-Item *create_func_exteriorring(Item* a);
-Item *create_func_centroid(Item* a);
-Item *create_func_envelope(Item* a);
-Item *create_func_pointn(Item* a, Item* b);
-Item *create_func_interiorringn(Item* a, Item* b);
-Item *create_func_geometryn(Item* a, Item* b);
+Item *create_func_geometry_from_text(Item *a);
+Item *create_func_as_text(Item *a);
+Item *create_func_srid(Item *a);
+Item *create_func_startpoint(Item *a);
+Item *create_func_endpoint(Item *a);
+Item *create_func_exteriorring(Item *a);
+Item *create_func_centroid(Item *a);
+Item *create_func_envelope(Item *a);
+Item *create_func_pointn(Item *a, Item *b);
+Item *create_func_interiorringn(Item *a, Item *b);
+Item *create_func_geometryn(Item *a, Item *b);
 
-Item *create_func_equals(Item* a, Item* b);
-Item *create_func_disjoint(Item* a, Item* b);
-Item *create_func_intersects(Item* a, Item* b);
-Item *create_func_touches(Item* a, Item* b);
-Item *create_func_crosses(Item* a, Item* b);
-Item *create_func_within(Item* a, Item* b);
-Item *create_func_contains(Item* a, Item* b);
-Item *create_func_overlaps(Item* a, Item* b);
+Item *create_func_equals(Item *a, Item *b);
+Item *create_func_disjoint(Item *a, Item *b);
+Item *create_func_intersects(Item *a, Item *b);
+Item *create_func_touches(Item *a, Item *b);
+Item *create_func_crosses(Item *a, Item *b);
+Item *create_func_within(Item *a, Item *b);
+Item *create_func_contains(Item *a, Item *b);
+Item *create_func_overlaps(Item *a, Item *b);
 
-Item *create_func_isempty(Item* a);
-Item *create_func_issimple(Item* a);
-Item *create_func_isclosed(Item* a);
+Item *create_func_isempty(Item *a);
+Item *create_func_issimple(Item *a);
+Item *create_func_isclosed(Item *a);
 
-Item *create_func_geometry_type(Item* a);
-Item *create_func_dimension(Item* a);
-Item *create_func_x(Item* a);
-Item *create_func_y(Item* a);
-Item *create_func_area(Item* a);
-Item *create_func_glength(Item* a);
+Item *create_func_geometry_type(Item *a);
+Item *create_func_dimension(Item *a);
+Item *create_func_x(Item *a);
+Item *create_func_y(Item *a);
+Item *create_func_area(Item *a);
+Item *create_func_glength(Item *a);
 
-Item *create_func_numpoints(Item* a);
-Item *create_func_numinteriorring(Item* a);
-Item *create_func_numgeometries(Item* a);
-
-Item *create_func_point(Item* a,Item* b);
+Item *create_func_numpoints(Item *a);
+Item *create_func_numinteriorring(Item *a);
+Item *create_func_numgeometries(Item *a);
 
+Item *create_func_point(Item *a, Item *b);