client/insert_test.c:
  Fixed core dump in test

BitKeeper/etc/ignore:
  added cmd-line-utils/libedit/common.h
mysys/queues.c:
  Added comments
sql/sql_parse.cc:
  Simple code cleanup
tests/grant.res:
  Updated results for 4.1

sql/sql_table.cc:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.control

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clone

cmd-line-utils/readline/.cvsignore:
  mvdir
cmd-line-utils/readline/COPYING:
  mvdir
cmd-line-utils/readline/INSTALL:
  mvdir
cmd-line-utils/readline/Makefile.am:
  mvdir
cmd-line-utils/readline/README:
  mvdir
cmd-line-utils/readline/ansi_stdlib.h:
  mvdir
cmd-line-utils/readline/bind.c:
  mvdir
cmd-line-utils/readline/callback.c:
  mvdir
cmd-line-utils/readline/chardefs.h:
  mvdir
cmd-line-utils/readline/complete.c:
  mvdir
cmd-line-utils/readline/configure.in:
  mvdir
cmd-line-utils/readline/display.c:
  mvdir
cmd-line-utils/readline/emacs_keymap.c:
  mvdir
cmd-line-utils/readline/funmap.c:
  mvdir
cmd-line-utils/readline/histexpand.c:
  mvdir
cmd-line-utils/readline/histfile.c:
  mvdir
cmd-line-utils/readline/histlib.h:
  mvdir
cmd-line-utils/readline/history.c:
  mvdir
cmd-line-utils/readline/history.h:
  mvdir
cmd-line-utils/readline/histsearch.c:
  mvdir
cmd-line-utils/readline/input.c:
  mvdir
cmd-line-utils/readline/isearch.c:
  mvdir
cmd-line-utils/readline/keymaps.c:
  mvdir
cmd-line-utils/readline/keymaps.h:
  mvdir
cmd-line-utils/readline/kill.c:
  mvdir
cmd-line-utils/readline/macro.c:
  mvdir
cmd-line-utils/readline/mbutil.c:
  mvdir
cmd-line-utils/readline/misc.c:
  mvdir
cmd-line-utils/readline/nls.c:
  mvdir
cmd-line-utils/readline/parens.c:
  mvdir
cmd-line-utils/readline/posixdir.h:
  mvdir
cmd-line-utils/readline/posixjmp.h:
  mvdir
cmd-line-utils/readline/posixstat.h:
  mvdir
cmd-line-utils/readline/readline.c:
  mvdir
cmd-line-utils/readline/readline.h:
  mvdir
cmd-line-utils/readline/rlconf.h:
  mvdir
cmd-line-utils/readline/rldefs.h:
  mvdir
cmd-line-utils/readline/rlmbutil.h:
  mvdir
cmd-line-utils/readline/rlprivate.h:
  mvdir
cmd-line-utils/readline/rlshell.h:
  mvdir
cmd-line-utils/readline/rlstdc.h:
  mvdir
cmd-line-utils/readline/rltty.c:
  mvdir
cmd-line-utils/readline/rltty.h:
  mvdir
cmd-line-utils/readline/rltypedefs.h:
  mvdir
cmd-line-utils/readline/rlwinsize.h:
  mvdir
cmd-line-utils/readline/search.c:
  mvdir
cmd-line-utils/readline/shell.c:
  mvdir
cmd-line-utils/readline/signals.c:
  mvdir
cmd-line-utils/readline/tcap.h:
  mvdir
cmd-line-utils/readline/terminal.c:
  mvdir
cmd-line-utils/readline/text.c:
  mvdir
cmd-line-utils/readline/tilde.c:
  mvdir
cmd-line-utils/readline/tilde.h:
  mvdir
cmd-line-utils/readline/undo.c:
  mvdir
cmd-line-utils/readline/util.c:
  mvdir
cmd-line-utils/readline/vi_keymap.c:
  mvdir
cmd-line-utils/readline/vi_mode.c:
  mvdir
cmd-line-utils/readline/xmalloc.c:
  mvdir
cmd-line-utils/readline/xmalloc.h:
  mvdir

Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results

sql/sql_table.cc:
  superfluous prepare_for_resend deleted

BitKeeper/deleted/.del-typelib.h~216638fc39e3e368:
  Delete: include/typelib.h

BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_unique.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  merge
libmysql/libmysql.def:
  merge
sql/ha_innodb.cc:
  merge
sql/item_cmpfunc.cc:
  merge
sql/log_event.cc:
  merge
sql/sql_handler.cc:
  merge

sql/sql_yacc.yy:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/try_compile/4.1

readline/Makefile.am:
  'removed redundant -I include dirs' in readline/Makefile.am returned!

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

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


sql/log_event.cc:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged

client/mysqlbinlog.cc:
  new option --local-load
sql/log_event.cc:
  converting 'load' to 'local load'
sql/log_event.h:
  converting 'load' to 'local load'

strings/ctype-utf8.c:
  Auto merged
strings/ctype-simple.c:
  merge
  Change '#if 0' to '#ifdef NOT_USED'

Allow one to change ANSI_QUOTES mode per thread and on the fly


sql/field.cc:
  Use new my_strntoxxx functions where function clears errno.
  Change variable names to 'not_used' for variables that is not used in function
sql/sql_base.cc:
  comment
sql/sql_lex.cc:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
sql/sql_lex.h:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
strings/ctype-simple.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number
strings/ctype-utf8.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number

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

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

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

sql/sql_cache.cc:
  using internal name conversion as it was suggested by Shurik

  Fix bug in PAGE_CUR_LE_OR_EXTENDS search


innobase/page/page0cur.c:
  Fix bug in PAGE_CUR_LE_OR_EXTENDS search

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


sql/log_event.cc:
  Auto merged

Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
Fixed rpl_temporary test


mysql-test/r/rpl_temporary.result:
  Fixed rpl_temporary test
mysql-test/t/rpl_temporary.test:
  Fixed rpl_temporary test
sql/log_event.cc:
  Replication: Optimize away string.append
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

XXX10_to_str were not inizialized

sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/ignore:
  added extra/mysql_waitpid

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

into myvenu.com:/home/venu/bk/src-4.1

strings/ctype-simple.c:
  Hide unused code
strings/ctype-utf8.c:
  Hide unused code

  Workaround for platforms which don't support EILSEQ


strings/ctype-utf8.c:
  Workaround for platforms which don't support EILSEQ

into hegel.local:/home/miguel/dev/mysql-4.0