It's a combination of collation and its derivation (precedence order)

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

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

  Temporarily fix for test failure
  ,.


sql/item_cmpfunc.cc:
  Temporarily fix for test failure
  ,.

  Rewritten in nicer way
  ,


sql/item_cmpfunc.cc:
  Rewritten in nicer way
  ,

   distribution as well

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


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Renamed as_text().


sql/item_create.cc:
  Renamed as_text().
sql/item_create.h:
  Renamed as_text().
sql/lex.h:
  Added AsWKT() alias for AsText().

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

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


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-4.1-build

include/Makefile.am:
   - added missing sql_state.h to source distribution

into rurik.mysql.com:/home/igor/mysql-4.1

into mysql.com:/space/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged

   distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)

into rurik.mysql.com:/home/igor/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_yacc.yy:
  Auto merged

  Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement


sql/sql_yacc.yy:
  Syntax change for preload statement
sql/lex.h:
  Syntax change for preload statement
mysql-test/t/preload.test:
  Removed non-generic info (key used blocks)
mysql-test/r/preload.result:
  Removed non-generic info (key used blocks)

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

libmysql/Makefile.am:
   - added client_settings.h to distribution

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

into rurik.mysql.com:/home/igor/mysql-4.1

BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE

into rurik.mysql.com:/home/igor/mysql-4.1

Makefile.am:
   - added sql-common directory to distribution
configure.in:
   - minor fixes
   - added sql-common/Makefile to AC_OUTPUT
include/Makefile.am:
   - added sql_common.h to distribution

into mysql.com:/space/my/mysql-4.1

  More edits to INSTALL-WIN-SOURCE.


INSTALL-WIN-SOURCE:
  More edits to INSTALL-WIN-SOURCE.

BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

enforce REAL_EMAIL


BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Delete: BitKeeper/triggers/post-incoming
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Delete: BitKeeper/triggers/post-outgoing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/space/my/mysql-4.1

  Initial cleanup edits.


INSTALL-WIN-SOURCE:
  Initial cleanup edits.

scripts/make_win_src_distribution.sh:
  Fix for --dirname and --suffix (missed ones)

Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive


scripts/make_win_src_distribution.sh:
  Fix for INSTALL-WIN-SOURCE

   consistent with the other column names in the table.