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.

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp

mysys/charset.c:
  Clear all fields at the end of previous charset

As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.

  SET NAMES BINARY now works


sql/sql_yacc.yy:
  SET NAMES BINARY now works

  new file

  As far as bk could not apply delta,
  I removed it.  Now I'm adding the
  new version into the tree again.

  Delete: mysql-test/r/ctype_many.result

  I could not commit it, bk told it can't apply binary delta
  for textual file.


BitKeeper/deleted/.del-ctype_many.result~9b541c4def2b5afb:
  Delete: mysql-test/r/ctype_many.result

mysql-test/t/ctype_many.test:
  Automatic client-server charset recoding has been added
mysys/charset.c:
  Automatic client-server charset recoding has been added
sql/item.cc:
  Automatic client-server charset recoding has been added
sql/item.h:
  Automatic client-server charset recoding has been added
sql/item_cmpfunc.cc:
  Automatic client-server charset recoding has been added
sql/item_func.cc:
  Automatic client-server charset recoding has been added
sql/item_strfunc.cc:
  Automatic client-server charset recoding has been added
sql/mysqld.cc:
  Automatic client-server charset recoding has been added
sql/protocol.cc:
  Automatic client-server charset recoding has been added
sql/sql_string.cc:
  Automatic client-server charset recoding has been added
sql/sql_yacc.yy:
  Automatic client-server charset recoding has been added
strings/ctype-utf8.c:
  Automatic client-server charset recoding has been added

  Automatic client-server charset recoding has been added


mysql-test/r/ctype_collate.result:
  Automatic client-server charset recoding has been added

  Bug fix
  0 stayed for length here, now it is charset.


sql/sql_show.cc:
  Bug fix

  Copy as is if src or dst are binary


sql/sql_string.cc:
  Copy as is if src or dst are binary

  binary comparing alway must be used, because sort_string() is executed for textual data.


sql/sql_select.cc:
  binary comparing alway must be used, because sort_string() is executed for textual data.

into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

and isn't used in libraries any longer

  system_charset_info was removed


client/mysql.cc:
  system_charset_info was removed
client/mysqlcheck.c:
  system_charset_info was removed
client/mysqldump.c:
  system_charset_info was removed
client/mysqlimport.c:
  system_charset_info was removed
client/mysqltest.c:
  system_charset_info was removed

Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  less system_charset_info


sql/sql_db.cc:
  less system_charset_info
sql/sql_parse.cc:
  less system_charset_info

sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

into sanja.is.com.ua:/home/bell/mysql/mysql-4.1

  Use LEX charset instead of system one


sql/sql_lex.cc:
  Use LEX charset instead of system one

into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1

removed all side effects from asserts for not to confuse casual reader

into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

into myvenu.com:/home/venu/work/sql/dev-4.1

(normal protocol only, prepared protocol already handles it)


sql/protocol.cc:
  Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format

into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/sql_lex.h:
  Auto merged

mysql-test/r/union.result:
  sect of uncachable union
mysql-test/t/union.test:
  sect of uncachable union
sql/sql_lex.h:
  fixed uncachable union

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  Move all charset recoding to the same place


sql/sql_lex.cc:
  Move all charset recoding to the same place

  Unnesessary binary() calls have been removed


sql/field.cc:
  Unnesessary binary() calls have been removed
sql/item_strfunc.cc:
  Unnesessary binary() calls have been removed
sql/item_func.cc:
  Unnesessary binary() calls have been removed
sql/sql_analyse.cc:
  Unnesessary binary() calls have been removed
sql/filesort.cc:
  Unnesessary binary() calls have been removed

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.test