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

BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_getopt.h:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged

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

   of MySQL (BUG#3860)

into mysql.com:/home/my/mysql-4.0

into mysql.com:/M40/mysql-4.0

  Revert this change, it was done in a mistake.


strings/ctype-latin1.c:
  Revert this change, it was done in a mistake.

sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge (use new code)

Update to new valgrind


mysql-test/mysql-test-run.sh:
  Update for new valgrind
sql/mysql_priv.h:
  Remove default argument to mysql_truncate()
sql/sql_parse.cc:
  Remove default argument to mysql_truncate()

  Fix a misleading plural that should be singular.
  Fix other typos while I'm at it.


include/mysql.h:
  Fix a misleading plural that should be singular.
  Fix other typos while I'm at it.

lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792


mysql-test/t/lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
mysql-test/r/lowercase_table.result:
  New results for modified lowercase_table test

sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792


sql/sql_base.cc:
  Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792

  Bug#3453: MySQL output formatting in multibyte character sets


client/mysql.cc:
  Bug#3453: MySQL output formatting in multibyte character sets

  new file

into build.mysql.com:/users/rburnett/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into poseidon.(none):/home/tomas/mysql-4.1-clean

ndb/src/common/mgmcommon/ConfigInfo.cpp:
  more aliases
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  oops bug

client/mysql.cc:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead
cmd-line-utils/libedit/search.c:
  regex.h fix
acinclude.m4:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead

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

into poseidon.(none):/home/tomas/mysql-4.1-clean

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


sql/sql_select.cc:
  Auto merged

into mysql.com:/media/sda1/mysql/mysql-4.1-5034

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


BitKeeper/etc/ignore:
  auto-union

into mysql.com:/media/sda1/mysql/mysql-4.1-5034

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


acinclude.m4:
  Auto merged
configure.in:
  Auto merged

Bug #4696  	segfault in cmd-line-utils/libedit/history.c:history_save() 
(bundled libedit)

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


BitKeeper/etc/ignore:
  added support-files/my-innodb-heavy-4G.cnf
sql/sql_select.cc:
  Auto merged

sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_class.cc:
  Manual resolve of the merge

into poseidon.(none):/home/tomas/mysql-4.1-clean

acinclude.m4:
  fixed AC_DEFINE(HAVE_HIST_ENTRY)