ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
  Two identical declarations on loop level will collide at function level.

  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user


innobase/buf/buf0flu.c:
  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

into mysql.com:/home/psergey/mysql-4.1-bug8510

into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1

into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/psergey/mysql-4.1-bug8510


sql/set_var.cc:
  Auto merged

"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.

 - Moved static variables defined inside of function to file scope to avoid this linking problem on FC3


sql/ha_berkeley.cc:
  Moved list of bdb extension to file scope
sql/ha_ndbcluster.cc:
  Moved list of ndb extesions to file scope
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

correct top_level_item for XOR


mysql-test/r/join_outer.result:
  one more test
mysql-test/t/join_outer.test:
  one more test

  Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.


sql/item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
mysql-test/t/join_outer.test:
  Added a test case for bug #9017.
mysql-test/r/join_outer.result:
  Added a test case for bug #9017.

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

sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge tests

into mysql.com:/M41/mysql-4.1

mysql-test/lib/mtr_report.pl:
  Keep the Perl version in sync with the shell script so that 'Do-compile' will call
  PS and ES tests even after some previous test failures.
  (See previous change to 'mysql-test-run.sh' and 'Do-compile'.)

into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1

  Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)


Build-tools/Do-solaris-pkg:
  Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)

sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  SCCS merged
mysql-test/t/join_outer.test:
  SCCS merged

Item_func_equal::not_null_tables() always return 0.


mysql-test/r/join_outer.result:
  Testcase for BUG#8711
mysql-test/t/join_outer.test:
  Testcase for BUG#8711
sql/item_cmpfunc.h:
  Fix for BUG#8711: "<=>" may have true value for NULL arguments, i.e. it can accept NULL-complemented 
  table rows. This differs from assumptions made in Item_func::not_null_tables(), so add 
  Item_func_equal::not_null_tables().
  Item_func_equal::not_null_tables_cache value doesn't make sense now, but we still let it be
  calculated (and ignore it)

adapt the Windows build files accordingly.


VC++Files/tests/mysql_client_test.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
VC++Files/tests/mysql_client_test_ia64.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
scripts/make_win_src_distribution.sh:
  1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
  By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
  from the source for each "$i" that already existed as a target directory.
  This is now prevented by checking the existence and adapting the command.
  
  2) Comment where "$BASE" (the target directory) comes into existence.
  
  3) Introduce an "abort" function as a start point for more sanity checks, use it.

Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into mysql.com:/home/timka/mysql/src/4.1-dbg

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

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


ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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

ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations

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

  Correction after manual merge.


mysql-test/r/func_str.result:
  Correction after manual merge.

sql/item_strfunc.cc:
  Auto merged

  Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith


innobase/log/log0recv.c:
  Better ibbackup message

mysql-test/lib/init_db.sql:
  Fixed mysql-test-run.pl's system tables to correspond to the real ones.

The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.


mysql-test/r/select.result:
  Added test result for BUG#7425.
mysql-test/t/select.test:
  Added test for BUG#7425.
sql/filesort.cc:
  Take into account whether 'item' represents a signed or an unsigned integer.
sql/item.cc:
  Once an Item_ref is resolved, propagate the unsigned_flag to the resolved item.

  bug#4914 added --help and usage information


scripts/mysqldumpslow.sh:
  bug#4914 added --help and usage information

    preserve backward compatibility


sql/mysqld.cc:
  preserve backward compatibility

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

    recalculate stats/gws for the last word in the index too
    remove unused code


myisam/myisam_ftdump.c:
  recalculate stats/gws for the last word in the index too
  remove unused code

  Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.


sql/item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
mysql-test/t/func_str.test:
  Added a test case for bug #8669.
mysql-test/r/func_str.result:
  Added a test case for bug #8669.

(recommit as 4.1->5.0 merge is not possible)


ndb/src/kernel/blocks/trix/Trix.cpp:
  Use correct length during unique index build

  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists


configure.in:
  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists