renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp



BitKeeper/deleted/.del-client_test.dsp~659d0237a4c12ea1:
  Delete: VC++Files/tests/client_test.dsp
VC++Files/mysql.dsw:
  renamed client_test to mysql_client_test
mysql-test/my_manage.c:
  fixed name for lstat in removef()
mysql-test/mysql_test_run_new.c:
  added mysql-debug.exe for Windows
  added enviroment variable MYSQL_CLIENT_TEST
  added cleaning directory before tests

into mysql.com:/home/wax/mysql/mysql-4.1test2

we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.

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

Build-tools/Bootstrap:
  Auto merged

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

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


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

innobase/mem/mem0pool.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
configure.in:
  Ignore changes that were backported to 4.0
scripts/mysql_install_db.sh:
  Ignore Ramil's changes for now

into mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqldump.c:
  Auto merged

  Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined


innobase/mem/mem0pool.c:
  Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined

BUILD/compile-ia64-debug-max:
  Added archive for this build.
sql/examples/ha_archive.cc:
  Removed duplicate close call.

into zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

  useful than *.old.<PID> - use the mtime of configure.in instead. 
  This gives us a time stamp of when this last build directory was created,
  e.g. "mysql-4.0.24-build-2005-01-31-16:47"


Build-tools/Bootstrap:
  - Rename already existing build directories to something more useful than
    *.old.<PID> - use the mtime of configure.in instead. This gives us a time
    stamp of when this last build directory was created, e.g.
    "mysql-4.0.24-build-2005-01-31-16:47"

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4

into mysql.com:/home/wax/mysql/mysql-4.1test2

    added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''



VC++Files/mysql.dsw:
  added client_test.dsp in project
mysql-test/my_create_tables.c:
  added CHARACTER SET in tables
  added 5th time zone
mysql-test/my_manage.c:
  included lstat in if()
mysql-test/mysql_test_run_new.c:
  expanded ignore list for windows
  added directory slave1 and slave2
  added options for mysqld and mysqltest
  fixed error in read_option()
  fixed and added enviroment variables for Linux and Windows
  rewrote str_tok()
mysql-test/t/ps_1general.test:
  added replacment 3th column

  Fix tests after merge from 4.0

  Merge from 4.0


sql/sql_select.cc:
  Auto merged

+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


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

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000

into gw.mysql.r18.ru:/usr/home/ram/work/4.0

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000

into hundin.mysql.fi:/home/marko/k/mysql-4.1


sql/set_var.cc:
  Auto merged

into hundin.mysql.fi:/home/marko/k/mysql-4.0

  Fix replication for multi-update
  new test - rpl_multi_update2


sql/mysql_priv.h:
  Bug#7011
    New function mysql_multi_update_lock()
sql/sql_parse.cc:
  Bug#7011
    New function check_multi_update_lock()
    For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
  Bug#7011
    Split out multi-update locking into its own function,
      mysql_multi_update_lock()

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

mysys/my_handler.c:
  Fix for a bug in multi table updates, when offset of one table is 
  5 bytes or more. This occured because in that case binary(5) indexed
  column is space packed, so it was hit by this bug in the function
  for binary comparison.
  Bug #7788

into mysql.com:/home/dlenev/src/mysql-4.1-tzbug

into bob.(none):/home/reggie/bk/mysql41

mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers


client/mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into zim.(none):/home/brian/mysql/mysql-4.1


sql/examples/ha_archive.cc:
  Auto merged

of strings of unequal length. (Bug #8134)


mysql-test/t/compare.test:
  Add new regression test
strings/ctype-simple.c:
  Fix value used for swapping negative/positive values using XOR
mysql-test/r/compare.result:
  Add new test result

sql/examples/ha_archive.cc:
  More comments, fixed issue with lost file descriptors.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/mysqldump.result:
  Update results