into mysql.com:/export/space/pekka/ndb/version/my41

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


client/mysqltest.c:
  Auto merged

into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean

set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.

into mysql.com:/export/space/pekka/ndb/version/my41

mysys/default.c:
  cleanup + check for the last line in the file in "!include" directive processing

  Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE


sql/ha_innodb.cc:
  Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE

mysql-test/t/ctype_ucs_binlog.test:
  Require ucs support

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

  At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes


innobase/fil/fil0fil.c:
  At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes

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

  Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()


innobase/row/row0sel.c:
  Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()

sql/mysqld.cc:
  Auto merged

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  error message
ndb/src/ndbapi/ndberror.c:
  error message

mysql-test/mysql-test-run.pl:
  1. Improved description of option user=USER
  2. Bug fix 
     The storage place of the old, to be removed <test case>.reject file is the 'r' subdirectory of the test suite.
  3. New option "start-dirty" which is 
     - per functionality a "start-and-exit" without an initiation
     - a convenient method to (re)start an existing database. 
       So a following
            ./mysql-test-run.pl --extern ......
       will meet a server running with the default ports and sockets according to our test environment.
     This option is useful for analyzing bugs and  WL#2520 Upgrade/Downgrade Test Plan .

mysql-test/Makefile.am:
  Remove reference to result.es
scripts/make_binary_distribution.sh:
  Remove references to result.es

if foreign_key_checks=0. (Bug #9802)


innobase/dict/dict0dict.c:
  dict_foreign_add_to_cache(): Add flag check_types.
  If the flag is FALSE, ignore character set mismatch.
innobase/dict/dict0load.c:
  dict_load_foreign(), dict_load_foreigns(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0dict.h:
  dict_foreign_add_to_cache(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0load.h:
  dict_load_foreigns(): Add flag check_types.
  If the flag is FALSE, differences in character sets will be ignored.
innobase/row/row0mysql.c:
  row_table_add_foreign_constraints(), row_rename_table_for_mysql():
  Pass trx->check_foreigns to dict_load_foreigns()
sql/ha_innodb.cc:
  ha_innobase::rename_table(): Clear trx->check_foreign if necessary.

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

  use DBUG_RETURN


ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#9757 - ndb
    use DBUG_RETURN

  Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Impl. 2 new dump 
  1) to query nf handling state
  2) that impl. sending of arbitrary signal...
     to be used with extreme care
ndb/src/kernel/main.cpp:
  enable critical and warnings in out file
ndb/src/mgmsrv/MgmtSrvr.cpp:
  call handleStopReply on nfCompleteRep instead
ndb/src/mgmsrv/MgmtSrvr.hpp:
  call handleStopReply on nfCompleteRep instead

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

myisam/mi_dynrec.c:
  new parameter for _mi_rec_check().
myisam/myisamdef.h:
  new parameter for _mi_rec_check().

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) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).



sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to add something to all: (thanks Konstantin)
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 :( )

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).


sql/sql_table.cc:
  When optimizing a table, if we fall back to mysql_alter_table()
  (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
  is not supposed to do any binlogging (it is done by the caller).

into mdk10.(none):/home/reggie/bk/mysql-4.1

function" into 4.1 tree.

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


sql/item_create.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged

function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.


mysql-test/r/query_cache.result:
  Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
  Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
  create_func_current_user():
    We should not cache queries which use CURRENT_USER() function.

  fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.


sql/item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
  fixing tests accordingly
mysql-test/r/union.result:
  fixing tests accordingly
mysql-test/t/ctype_collate.test:
  fixing tests accordingly
mysql-test/r/ctype_collate.result:
  fixing tests accordingly

into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1

sql/sql_udf.cc:
  Fix typos

into xiphis.org:/var/db/bk/work-acurtis/bug6776.1


sql/sql_udf.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mdk10.(none):/home/reggie/bk/mysql-4.1

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

Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server


sql/mysqld.cc:
  removed the code that set the shared memory connect event since this also being done in kill_server

into mdk10.(none):/home/reggie/bk/mysql-4.1

into mysql.com:/M41/mysql-4.1