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


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.0

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

added error code for failing send signal and timeout waiting for node failure


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added error code for failing send signal and timeout waiting for node failure
ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

Bug #26997  	mysqld segfault when in single user mode


sql/ha_ndbcluster.cc:
  make sure error is always set even if no proper error code from ndb
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add error code for failing send signal (typically single user mode)
storage/ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

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

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca


storage/ndb/tools/waiter.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  merge

into  poseidon.mysql.com:/home/tomas/mysql-5.0

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean

into  poseidon.mysql.com:/home/tomas/mysql-5.0

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged

Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
- correction of part 1
    add ndb_waiter option to wait for single user mode


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
ndb/tools/waiter.cpp:
  add ndb_waiter option to wait for single user mode

BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed


storage/ndb/src/kernel/vm/Pool.hpp:
  Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the ri
  ght value, or else the parameter ptr should be "not touched"

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format


mysql-test/t/rpl_ssl.test:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
mysql-test/r/rpl_ssl.result:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)


configure.in:
  Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


support-files/compiler_warnings.supp:
  Auto merged

support-files/compiler_warnings.supp:
  add comment to make this file more useful

into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
extra/comp_err.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
BUILD/SETUP.sh:
  Use local

sql/event_data_objects.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.
sql/log.cc:
  Using time_t instead of my_time_t when calculating current_time.
  This is a potential bugfix for problem with mysql_system_db reporting
  slow log as crashed.
sql/sql_show.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


extra/comp_err.c:
  Auto merged

comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning


extra/comp_err.c:
  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51

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


sql/ha_ndbcluster.cc:
  Auto merged