into mysql.com:/usr/home/ram/work/4.1.b4802


client/mysql.cc:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.


sql/item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
mysql-test/t/func_str.test:
  Added a test case for bug #7751.
mysql-test/r/func_str.result:
  Added a test case for bug #7751.

ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4

into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/eval0eval.ic:
  Auto merged

  Remove wrong assertion that fails on 64 bits


innobase/include/eval0eval.ic:
  Remove wrong assertion that fails on 64 bits

into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/rem0rec.ic:
  SCCS merged
sql/sql_select.cc:
  SCCS merged

  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed


innobase/include/rem0rec.ic:
  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/sql_class.h:
  Auto merged

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

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

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

perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows


extra/perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows

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

sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table


sql/sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  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

  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()