GitLab

The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()


mysql-test/r/gis.result:
  test result
mysql-test/t/gis.test:
  testcase
sql/field.cc:
  reset() now returns error sign
sql/field.h:
  Field_*::reset() now returns error sign if the field can't be reset
sql/sql_load.cc:
  check if field can't be reset and return error if it's so

we didn't have code creating GEOMETRY-type fields from Items (expression results)
So i added this code


mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  testcase added
sql/item_geofunc.cc:
  Item_geometry_func::tmp_table_field implemented
sql/item_geofunc.h:
  tmp_table_field() and get_geometry_type() declared

The AsBinary function returns VARCHAR data type with binary collation.
It can cause problem for clients that treat that kind of data as
different from BLOB type.
So now AsBinary returns BLOB.


mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test case added
sql/item_geofunc.h:
  Now we return MYSQL_TYPE_BLOB for asBinary function

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  testcase added
sql/sql_table.cc:
  no need to specify keylength for Point type
sql/sql_yacc.yy:
  no need to specify length for Point type

mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  test case added
sql/sql_table.cc:
  we should check this for GEOMETRY fields

mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  test case added
sql/field.cc:
  ::construct calls added
sql/item_geofunc.cc:
  ::construct calls added
sql/spatial.cc:
  Geometry_*::init_from_wkb implemented
sql/spatial.h:
  init_from_wkb methods declared

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test corrected

mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  test case
sql/sp_head.cc:
  m_geom_returns is sent to make_field
sql/sp_head.h:
  m_geom_returns declared
sql/sql_yacc.yy:
  m_geom_returns initializing added

mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis.test:
  testcase added

mysql-test/t/alias.test:
  Added end marker for test to make future merges easier
mysql-test/t/alter_table.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyse.test:
  Added end marker for test to make future merges easier
mysql-test/t/analyze.test:
  Added end marker for test to make future merges easier
  Fixed length of comment lines
mysql-test/t/ansi.test:
  Added end marker for test to make future merges easier
mysql-test/t/archive.test:
  Added end marker for test to make future merges easier
mysql-test/t/auto_increment.test:
  Added end marker for test to make future merges easier
mysql-test/t/backup.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-1.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-2.test:
  Added end marker for test to make future merges easier
mysql-test/t/bdb-crash.test:
  Added end marker for test to make f...

mysql-test/r/gis-rtree.result:
  test result fixed
mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis-rtree.test:
  test case fixed
mysql-test/t/gis.test:
  test case added
sql/field.cc:
  error messages launched now when we try to put bad spatial
  data in the GEOMETRY field
sql/field.h:
  interface fixed
sql/item_geofunc.cc:
  bad_data sign now instead of NULL now returned from
  Item_geometry_from_text::val_str
sql/share/errmsg.txt:
  error message added
sql/spatial.cc:
  bad_geometry data instance
sql/spatial.h:
  bad_geometry_data declaration
sql/sql_base.cc:
  messages now created in store_* function

I learned that one shouldn't use String::set in val_str() methods...


mysql-test/r/gis.result:
  Test result for #6117
mysql-test/t/gis.test:
  Test case #6117
sql/item_geofunc.cc:
  String::set doesn't work here
sql/spatial.cc:
  Error message isn't needed here

CREATE TABLE t1 SELECT POINT(1,2); fixed


mysql-test/r/gis.result:
  Appropriate test result
mysql-test/t/gis.test:
  test case
sql/item_geofunc.cc:
  Item_geometry_func::fix_lengths_and_dec implementation
  several fix_length_and_dec's not needed now
sql/item_geofunc.h:
  Item_geometry_func class presented

This bug is the result of weird error happening with mi_float8get and double
arythmetic. I described that in 'Bug that looks potentially dangerous' email


myisam/rt_mbr.c:
  *ab_area was changed with the local variable just to make the function
  working without errors
mysql-test/r/gis.result:
  appropriate test result
mysql-test/t/gis.test:
  Test case

--with-geometry and
--with-embedded-privilege-control
configure switches added


acconfig.h:
  necessary lines added
myisam/mi_open.c:
  #include added
mysql-test/t/gis-rtree.test:
  test modified to take HAVE_GEOMETRY in account
mysql-test/t/gis.test:
  test modified to take HAVE_GEOMETRY in account
sql/mysql_priv.h:
  option's variables added
sql/mysqld.cc:
  option's handling added
sql/set_var.cc:
  option's descriptions added

test for IGNORE added


mysql-test/r/gis.result:
  test result for IGNORE added
mysql-test/t/gis.test:
  test for IGNORE added

mysql-test/r/gis.result:
  test result added
mysql-test/t/gis.test:
  test case added
sql/field.h:
  now set_field_to_null can return -1
sql/field_conv.cc:
  now set_field_to_null* can return -1

heap/hp_delete.c:
  Added comments
mysql-test/r/gis.result:
  Updated results after name changes (all results line are unchanged)
mysql-test/r/show_check.result:
  Update test results after fix in hp_delete.cc
mysql-test/t/gis.test:
  Changed table names to longer, hopefully non conflicting ones.
  Added missing drop table
mysys/hash.c:
  Inendation cleanup
mysys/tree.c:
  Updated comments
  Decrease tree->allocated on delete (for status)
sql/field.cc:
  Added safety checking for GIS objects
sql/gstream.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/gstream.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/item_create.cc:
  Indentation fixup
sql/item_geofunc.cc:
  Use new gis interface functions and new gis class names.
  Simple optimizations
  Indentation fixups
  Fixed a lot of unlikely but possible errors.
sql/item_geofunc.h:
  Moved SRID_SIZE to spatial.h
sql/spatial.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/spatial.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
  Indentation fixes
  Use bool instead of int as result type for functions that only return 0 or 1
sql/sql_string.cc:
  Simple optimizations
sql/sql_string.h:
  Simple cleanups
sql/structs.h:
  Added LEX_STRING_WITH_INIT (needed by spatial.cc)

code covarage for srid, GeomFromText with 2 parameters
code covarage foe print() method of gis functions


mysql-test/r/gis.result:
  code covarage for srid, GeomFromText with 2 parameters
  code covarage foe print() method of gis functions
mysql-test/t/gis.test:
  code covarage for srid, GeomFromText with 2 parameters
  code covarage foe print() method of gis functions
  + commented test for issimple() (bugreport sent)
sql/item_geofunc.h:
  fixed printability of gis functions

LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).


mysql-test/t/gis.test:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).
sql/lex.h:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).

geometry type (POINT, LINESTRING, etc)
and changed all into "GEOMETRY".

Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.

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.

Added Centroid(), Area() tests for MultiPolygon objects.