sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

new error handling
Item_ref bug fixed


include/mysql_com.h:
  new error handling
  query cache pointer description
mysql-test/r/distinct.result:
  new result's after Monty's bug fixing
mysql-test/r/subselect.result:
  subselect with union test
mysql-test/t/subselect.test:
  subselect with union test
sql/item.cc:
  subselect with union
  Item_ref bug fixed
sql/item_cmpfunc.cc:
  Monty's bug fixing
sql/item_subselect.cc:
  TODO changing
  subselect with union
sql/item_subselect.h:
  subselect with union
sql/mysql_priv.h:
  Item_ref bug fixed
sql/mysqld.cc:
  new error handling
sql/net_pkg.cc:
  new error handling
sql/net_serv.cc:
  new error handling
sql/sql_base.cc:
  Item_ref bug fixed
sql/sql_class.cc:
  new error handling
sql/sql_class.h:
  new error handling
sql/sql_derived.cc:
  subselect with union
sql/sql_insert.cc:
  new error handling (only with mysql_select now)
sql/sql_lex.cc:
  subselect with union
sql/sql_lex.h:
  subselect with union
sql/sql_parse.cc:
  new error handling
sql/sql_select.cc:
  new error handling
  subselect with union
  removed thd->where=0 hack
sql/sql_select.h:
  subselect with union
sql/sql_union.cc:
  subselect with union
sql/sql_update.cc:
  new error handling (only with mysql_select now)
sql/sql_yacc.yy:
  subselect with union

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

I know I should have waited for Monty's merge ...

SELECT k FROM t1 GROUP BY k COLLATE latin1 ORDER BY k COLLATE latin1_de

that will take place properly after pull from 4.0, in order to 
handle conversions from quoted constants to bigint's.

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

BitKeeper/deleted/.del-sql_select.h.rej~9724e7a9d86d9f54:
  Delete: sql/sql_select.h.rej

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

New class Item_func_set_collation()
Fixed that "SELECT CONVERT(expr USING charset) GROUP BY 1" was not working
New COLLATION syntax:  <expr> COLLATE latin1 


mysql-test/r/ctype_many.result:
  New test slot has been added
mysql-test/t/ctype_many.test:
  New test slot has been added
sql/item_strfunc.cc:
  "SELECT CONVERT(expr USING another_charset) GROUP BY 1"  was not working as expected
  New Item_func_set_collation class
sql/item_strfunc.h:
  "SELECT CONVERT(expr USING another_charset) GROUP BY 1"  was not working as expected
  New Item_func_set_collation class
sql/lex.h:
  New keyword
sql/sql_yacc.yy:
  Stupid bug fixes
  COLLATION syntax

sql/share/charsets/Index:
  New charsets

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

server-cert.pem	regenerated
client-key.pem	regenerated
client-cert.pem	regenerated
cacert.pem	regenerated
sslopt-case.h	changed optarg to argument, decomment --ssl-key


include/sslopt-case.h:
  changed optarg to argument, decomment --ssl-key
SSL/cacert.pem:
  regenerated
SSL/client-cert.pem:
  regenerated
SSL/client-key.pem:
  regenerated
SSL/server-cert.pem:
  regenerated
SSL/server-key.pem:
  regenerated

 - removoved getopt.h (has been replaced by my_getopt.h)


BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
  Delete: include/getopt.h
include/Makefile.am:
   - Added missing file my_getopt.h to distribution
sql/Makefile.am:
   - Added missing files spatial.h adn gstream.h to distribution

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

BitKeeper/etc/ignore:
  Added mysys/charset2html to the ignore list

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

Docs/manual.texi:
  Worked on the logging section.
  Reworded some sentences
  Fixed a broken table
  Removed extraneous '!'s
  Removed extraneous ','s
  'file name' and 'filename' are used interchangeably but they should be consistent--
  so I changed some 'file name' occurances to 'filename'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/init.cc:
  This code is moved to more proper place in mysys/charset.c

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

mysql-test/r/subselect.result:
  added test suite of EXISTS clause
mysql-test/t/subselect.test:
  added test suite of EXISTS clause
sql/item_subselect.cc:
  added checking out of memory
  fixed bug in exists subselect

Some fixes and improvements

New fields in CHARSET_INFO for more nice SHOW CHARACTER SET
Dynamic charsets are now handled in faster way
SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too


include/m_ctype.h:
  Renamed constant
  New fields in CHARSET_INFO
include/my_sys.h:
  Constant have been moved to m_ctype.h
libmysqld/lib_sql.cc:
  Renamed constant
mysys/charset.c:
  Dynamic charsets are now handled in new way to speedup things
mysys/test_charset.c:
  Renamed constant
sql/mysqld.cc:
  Renamed constant
sql/sql_show.cc:
  SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too
strings/ctype.c:
  New fields in CHARSET_INFO

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

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

into ram.(none):/home/ram/work/mysql-4.1.spatial


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

server-cfg.sh	set bdb as transactional


sql-bench/server-cfg.sh:
  remove %smds, remove conversation from date to int for mysql,
  set bdb as transactional
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Small fixes in database default charset code


sql/mysql_priv.h:
  SHOW CREATE DATABASE name;
sql/sql_db.cc:
  SHOW CREATE DATABASE name;
sql/sql_lex.h:
  SHOW CREATE DATABASE name;
sql/sql_parse.cc:
  SHOW CREATE DATABASE name;
sql/sql_yacc.yy:
  SHOW CREATE DATABASE name;

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