include/mysql_com.h:
  Partial changes for new secure connection handing required to 
  pull 4.0 -> 4.1 merge
sql/item_strfunc.cc:
  Handling of dynamic possible length for password
sql/item_strfunc.h:
  Larger buffer for password
sql/mysqld.cc:
  Added option to force old password format
sql/password.c:
  Begin implementing new hashing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

as expected and returned default charset instead:
SET @x = _koi8_ru'test';
SELECT CHARSET(@x);

SELECT * FROM t WHERE (c COLLATE latin1) >'a'
might fail in some cases

Some optimization to reduce rules number in sql_yacc.yy


mysql-test/r/create.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/fulltext.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/innodb.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/merge.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/show_check.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/symlink.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/type_enum.result:
  Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/type_set.result:
  Now table and database inhirited a character set from a level above at CREATE time
sql/sql_yacc.yy:
  Now table and database inhirited a character set from a level above at CREATE time
  Some optimization to reduce rules number

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

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

0 was dispayed before, this looked confusing.

sql/share/charsets/cp866.conf:
  Fixed sort order

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