BitKeeper/etc/ignore:
  Revert the ignore change I did.

innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate key row we take X-lcok
  for duplicate row.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate key and we can
  take X-lock in this case for duplicate key records.
BitKeeper/etc/ignore:
  Added innobase/row/row0index.c to the ignore list

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G

sql/sql_parse.cc:
  typo - line awol during commit.

into hundin.mysql.fi:/home/marko/mysql-5.0

innobase/include/rem0rec.ic:
  Eliminate int16_t from an assertion, as it is not defined in the
  same system headers on all platforms.  (Bug #8244)

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


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

  Support for COMMIT/ROLLBACK optional arguments


innobase/include/trx0roll.h:
  WL#1967
    trx_release_savepoint_for_mysql()
innobase/trx/trx0roll.c:
  WL#1967
    trx_release_savepoint_for_mysql()
mysql-test/r/innodb.result:
  WL#1967
    Test for savepoint release
mysql-test/t/innodb.test:
  WL#1967
    Test for savepoint release
sql/ha_innodb.cc:
  WL#1967
    innobase_release_savepoint_name()
sql/ha_innodb.h:
  WL#1967
    innobase_release_savepoint_name()
sql/handler.cc:
  WL#1967
    ha_release_savepoint_name()
sql/handler.h:
  WL#1967
    ha_release_savepoint_name()
sql/lex.h:
  WL#1967
    New tokens: CHAIN, RELEASE
sql/mysqld.cc:
  WL#1967
    new option: completion-type
sql/set_var.cc:
  WL#1967
    new option: completion-type
sql/sql_class.h:
  WL#1967
    new option: completion-type
sql/sql_lex.h:
  WL#1967
    Support RELEASE SAVEPOINT
    additional flags to support COMMIT/ROLLBACK options
sql/sql_parse.cc:
  WL#1967
    Transaction operations in mysql_endtrans(), begin_trans()
sql/sql_yacc.yy:
  WL#1967
    Support COMMIT/ROLLBACK optional args

into bob.(none):/home/reggie/bk/mysql5.0

into bob.(none):/home/reggie/bk/mysql5.0


extra/perror.c:
  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

  --with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree


config/ac-macros/character_sets.m4:
  --with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree

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 bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

mysql-test/t/client_xml.test:
  Exclude create in mysqldump test, it includes timestamp
mysql-test/r/client_xml.result:
  Update result file

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


client/mysql.cc:
  Auto merged

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

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

BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged

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

  Fix for merge from 4.1

  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

  Merge from 4.1


sql/sql_select.cc:
  Auto merged

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 mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

innobase/row/row0mysql.c:
  row_truncate_for_mysql(): Always lock the data dictionary.
  row_truncate_for_mysql(): Improve comments and diagnostic messages.
sql/ha_innodb.cc:
  delete_all_rows(): Replace innobase_commit_low()
  with innobase_commit(). (partial fix to Bug #8151)

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