into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/home/hf/work/mysql-5.1.mrge


mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

support-files/mysql.spec.sh:
  SCCS merged

  Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent

  Specify yaSSL .a file, not .la (bug#19966)
  Don't use Mac OS X "__.SYMDEF SORTED" file in archives


libmysqld/Makefile.am:
  Specify yaSSL .a file, not .la (bug#19966)
  Don't use Mac OS X "__.SYMDEF SORTED" file in archives

  Change mode to -rw-rw-r--


mysql-test/r/archive_bitfield.result:
  Change mode to -rw-rw-r--
mysql-test/r/binlog_row_binlog.result:
  Change mode to -rw-rw-r--
mysql-test/r/ctype_cp932_binlog_row.result:
  Change mode to -rw-rw-r--
mysql-test/r/events.result:
  Change mode to -rw-rw-r--
mysql-test/r/events_bugs.result:
  Change mode to -rw-rw-r--
mysql-test/r/events_logs_tests.result:
  Change mode to -rw-rw-r--
mysql-test/r/events_microsec.result:
  Change mode to -rw-rw-r--
mysql-test/r/events_stress.result:
  Change mode to -rw-rw-r--
mysql-test/r/federated_transactions.result:
  Change mode to -rw-rw-r--
mysql-test/r/myisam-system.result:
  Change mode to -rw-rw-r--
mysql-test/r/ndb_config2.result:
  Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_ddl.result:
  Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_disk2memory.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_insert_id_pk.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2innodb.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2myisam.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob2.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_charset.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_dd_advance.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_func003.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_log.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update2.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update3.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_relayrotate.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_row_001.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_sp006.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_UUID.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_trig004.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_relay_space_innodb.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_innodb.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_myisam.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_row_log_innodb.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_row_mysqlbinlog.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_stm_EE_err2.result:
  Change mode to -rw-rw-r--
mysql-test/r/type_newdecimal-big.result:
  Change mode to -rw-rw-r--
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  Change mode to -rw-rw-r--
mysql-test/t/events_logs_tests-master.opt:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_commit_afterflush.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_insert_ignore.test:
  Change mode to -rw-rw-r--
plugin/fulltext/AUTHORS:
  Change mode to -rw-rw-r--
plugin/fulltext/ChangeLog:
  Change mode to -rw-rw-r--
plugin/fulltext/NEWS:
  Change mode to -rw-rw-r--
plugin/fulltext/README:
  Change mode to -rw-rw-r--
plugin/fulltext/configure.in:
  Change mode to -rw-rw-r--
storage/archive/plug.in:
  Change mode to -rw-rw-r--
storage/example/plug.in:
  Change mode to -rw-rw-r--

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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


include/my_pthread.h:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged
sql/set_var.cc:
  Resolve conflict
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Resolve conflict

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/sslopt-longopts.h:
  Resolve conflict
include/sslopt-vars.h:
  Resolve conflict
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

  ndb: fix compile error on solaris


sql/ha_ndbcluster_binlog.cc:
  ndb: fix compile error on solaris

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

ndb: moved startup order back for ndb binlog thread from previous push that seems to be causing startup issues

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter

  Fix recursive mutex lock in drop index (ndbapi programs only)


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Fix recursive mutex lock in drop index (ndbapi programs only)

  corrected compile error


storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  corrected compile error

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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


sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/psergey/mysql-5.1-merge


include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0


sql/mysqld.cc:
  Auto merged

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

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

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


include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

 - A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact


include/my_pthread.h:
  Check return value from sigaction with a DBUG_ASSERT
  Also DBUG_ASSERT if signal number 0 is passed
sql/mysqld.cc:
  Don't call my_sigset if signo is 0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"


ndb/include/util/SocketServer.hpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/common/util/SocketServer.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/mgmsrv/Services.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"

    Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak


mysql-test/r/ndb_autodiscover3.result:
  Bug #19395 mysqld does not always detect cluster shutdown
mysql-test/t/disabled.def:
  Bug #19395 mysqld does not always detect cluster shutdown
mysql-test/t/ndb_autodiscover3.test:
  Bug #19395 mysqld does not always detect cluster shutdown
sql/ha_ndbcluster_binlog.cc:
  Bug #19395 mysqld does not always detect cluster shutdown
storage/ndb/include/ndbapi/Ndb.hpp:
  Bug #19395 mysqld does not always detect cluster shutdown
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug #19395 mysqld does not always detect cluster shutdown
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak

into  rurik.mysql.com:/home/igor/mysql-5.0

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new