into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged

include/my_global.h:
  Add "&& defined(__GNUC__)"

BUILD/check-cpu:
  Recognize more cpu's
  Fix for older compilers

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


include/my_global.h:
  Auto merged
sql/item.h:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged

  honor abort_option as TC now abort on 288


ndb/src/ndbapi/NdbIndexOperation.cpp:
  honor settings as TC now abort on 288

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


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

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

  version-dependent information (which causes test failures when running the test with a
  different version string)


mysql-test/r/mysqldump.result:
  - fixed the results (removed the version-dependent comments to avoid a test failure)
mysql-test/t/mysqldump.test:
  - added "--skip-comments" to avoid printing comments that include version-dependent information
    (which causes test failures when running the test with a different version string)

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

into mysql.com:/space/my/mysql-4.1-build

cmd-line-utils/libedit/Makefile.am:
  - added vis.h to the source distribution

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  fix name of result tar ball


ndb/test/run-test/ndb-autotest.sh:
  append run to result tar ball

into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).


sql/share/czech/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/danish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/dutch/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/english/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/estonian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/french/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/german/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/greek/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/hungarian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/italian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese-sjis/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/korean/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian-ny/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/polish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/portuguese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/romanian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/russian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/serbian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/slovak/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/spanish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/swedish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/ukrainian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1


BitKeeper/etc/logging_ok:
  auto-union

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  #include <mysql_priv.h>


sql/ha_blackhole.cc:
  - Windows compile fix - use #include "mysql_priv.h" instead of #include <mysql_priv.h>

client/client_priv.h:
  Additional option for insert-ignore
client/mysqldump.c:
  Additional insert-ignore, change of delayed variable to insert_option
mysql-test/r/mysqldump.result:
  Test results for --ignore-insert option.
mysql-test/t/mysqldump.test:
  New additions to the test.

  fix configs and scripts


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  fix ports
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  fix ports
ndb/test/run-test/ndb-autotest.sh:
  minor bugs

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/share/Makefile.am:
  Auto merged
libmysql/libmysql.c:
  Merge from 4.0

libmysql/libmysql.c:
  Backport fix for escaping multibyte characters from 4.1

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/create.result:
  Auto merged

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Fix bug by moving TRUE/FALSE in with other literals.


mysql-test/r/create.result:
  Test for Bug#9666
mysql-test/t/create.test:
  Test for Bug#9666
sql/sql_yacc.yy:
  Move TRUE/FALSE in with other literals.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.


mysql-test/r/insert_update.result:
  Test for Bug#9725
mysql-test/t/insert_update.test:
  Test for Bug#9725
sql/sql_insert.cc:
  Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  fixes


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  dl145 uses /home for running
ndb/test/run-test/make-config.sh:
  output d.txt aswell
ndb/test/run-test/ndb-autotest.sh:
  more scripts updates

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

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

  upgrades to shell script


ndb/test/run-test/Makefile.am:
  add config files
ndb/test/run-test/ndb-autotest.sh:
  bump version
  use rsync to sync participating hosts

when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.


configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to :
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted