Fixes in GeomFromText() to accept an new optional
   argument respobsible for SRID. This is for more
   OpenGIS conformance and PostGIS compatibility
   to simplify migrating from PgSQL to MySQL


sql/gen_lex_hash.cc:
  Changed max_allowed_array
sql/lex.h:
  Added several symbols for new OpenGIS SQL functions
sql/sql_yacc.yy:
  new OpenGIS functions (spatial constructors)

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

BitKeeper/etc/ignore:
  Added libmysqld/gstream.cc libmysqld/spatial.cc to the ignore list

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

BitKeeper/etc/ignore:
  Added myisam/rt_test myisam/sp_test to the ignore list

into work.mysql.com:/home/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Added new regex for XREFs, to have them in correct English-grammar.
  Minor fixup to removed node catcher from earlier change.
Docs/manual.texi:
  Fixup of Texinfo @ref/@xref/@pxref usage in appropriate locations.

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

RTREEs will be used for GIS extension in MySQL


myisam/.cvsignore:
  Added sp_test and rt_test
myisam/Makefile.am:
  Added RTREE files
myisam/mi_create.c:
  Added RTREE/SPATIAL initialization
myisam/mi_delete.c:
  Switched to use virual function, instead of mi_ck_delete() direct call
myisam/mi_key.c:
  Added sp_make_key() call in the case of SPATIAL index type
myisam/mi_open.c:
  Added some new initialization actions which depend on key_alg being used: RTREE or BTREE
myisam/mi_range.c:
  Rtree estimation
myisam/mi_rkey.c:
  rtree
myisam/mi_rnext.c:
  rtree
myisam/mi_rnext_same.c:
  rtree
myisam/mi_static.c:
  New search flags for bounding rectungles
myisam/mi_test1.c:
  one now should always specify key_alg during keyinfo initializing: BTREE or RTREE
myisam/mi_test2.c:
  Added key_alg initializing
myisam/mi_test3.c:
  Added key_alg initialization
myisam/mi_update.c:
  Switched to virtual functions, instead of mi_ck_delete/mi_ck_write direct call
myisam/mi_write.c:
  Virtual function instead of mi_ck_write() direct call
myisam/myisamdef.h:
  Rtree additions

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

Fixed typo.

include/myisam.h:
  These two new fields are initialized to either rtree or btree routines

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Added update about PostgreSQL 7.2 and VACUUM.

into linux.local:/home/zak/bk/mysql-4.0

  Fix typo in a contrib download filename


Docs/manual.texi:
  Fix typo in a contrib download filename

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Series of minor changes to convert the output of makeinfo to well-formed XML
   - Discarded DTD - ORA can add their own appropriate DTD
   - Added required XML PI - included appropriate character encoding information
   - Added missing abstract and bookinfo tags
   - Escaped ampersands in HTML escape sequences to allow validation - need to review
Docs/Support/make-docbook:
  Forced validation of XML document at end of conversion process
  Removed temporary files - set makeinfo output to stdout
BitKeeper/etc/ignore:
  Added Docs/safe-mysql.xml to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Remove link to sqlscreens in the contrib section


Docs/manual.texi:
  Remove link to sqlscreens in the contrib section

  Move to 4.1
README:
  It is just test, ignore. My first attempt to push into bk


README:
  It is just test, ignore. My first attempt to push into bk
BitKeeper/triggers/post-commit:
  Move to 4.1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  All lines in @example blocks need to be <76 chars.
  Minor cleanup of other stuff in @example blocks.

Added mention of USE/IGNORE KEY as alias for USE/IGNORE INDEX.
Fixups references to this feature throughout manual.

Docs/manual.texi:
  Added USE INDEX / IGNORE INDEX syntax to table_references info in SELECT.
  Added USE INDEX / IGNORE INDEX to function index.

Docs/Support/docbook-fixup.pl:
  Added fixup for xref closing /> tag to prevent malformed XML.
  Improved /para whitespace removal.
Docs/manual.texi:
  Removed double whitespace in middle of sentence.

sql/sql_parse.cc:
  Auto merged