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

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

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

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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged

    ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error

into  production.mysql.com:/usersnfs/tulin/mysql-5.0

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/rpl_temporary.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge

fixing encoding example because of table names can not be in koi8r 
on some platforms.


mysql-test/t/rpl_temporary.test:
  koi8r encoding to name tables is changed for latin1 for the former does not work
  on some platforms.
  The effect of the test remains: a test table is named to have multibyte utf8 representation,
  which is the essence of the bug.

into mysql.com:/home/psergey/mysql-5.0-bug19618

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

into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd


ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb: added missing lock of mutex

into mysql.com:/home/psergey/mysql-5.0-bug19618

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


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

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


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

into  mysql.com:/data0/knielsen/tmp-5.0

mysql-test/r/rpl_temporary.result:
  Fixed result file

into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


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

into  mysql.com:/data0/knielsen/tmp-5.0

into  mysql.com:/users/lthalmann/bk/mysql-5.0-rpl

into  mysql.com:/usr/local/mysql/tmp-5.0


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

into  dl145j.mysql.com:/tmp/andrei/5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/tmp-5.0

sql/item.cc:
  After-merge fixes.
sql/item.h:
  After-merge fixes.
sql/item_func.cc:
  After-merge fixes.
sql/item_func.h:
  After-merge fixes.
sql/sp_head.cc:
  After-merge fixes.

into  mysql.com:/usr/local/mysql/tmp-5.0


sql/sp_head.cc:
  Manual merge.

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547

ndb/test/ndbapi/Makefile.am:
  enable testInterpreter
ndb/test/ndbapi/testInterpreter.cpp:
  add test case Bug19537
  the bug fix also fixed IncValue64 for whatever reason..
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32

into  mysql.com:/home/alexi/innodb/mysql-4.1-ss29

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


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge

client/mysqlbinlog.cc:
  Now my_end() deallocates DBUG by default, but that fails in mysqlbinlog
  because of global destructors that use DBUG.
dbug/dbug.c:
  Add a facility to deallocate the debug stack, to avoid memory leak warnings
  in Valgrind.
include/my_dbug.h:
  Add a facility to deallocate the debug stack, to avoid memory leak warnings
  in Valgrind.
include/my_sys.h:
  Change my_end() to deallocate DBUG memory by default (can be disabled with
  MY_DONT_FREE_DBUG option).
libmysql/libmysql.c:
  Do not deallocate DBUG during cleanup.
mysys/my_init.c:
  Change my_end() to deallocate DBUG memory by default (can be disabled with
  MY_DONT_FREE_DBUG option).
sql/mysqld.cc:
  Add missing my_thread_end() call, seems to occasionally trigger a memory
  leak (not repeatable).

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
 Null merge


innobase/os/os0file.c:
  Null merge
sql/ha_innodb.cc:
  Null merge

specific to 5.0 version of the patch is motivated by the fact that a wrapper over 
MYSQLLOG::write can not help in 5.0 where query's charset is embedded into event instance in the constructor.


sql/mysql_priv.h:
  this 4.1 specific code does not help in 5.0
sql/sql_base.cc:
  No wrapper similar to 4.1's version is done since Query_log_event constructor
  takes care of encodings in 5.0 whereas log::write method does it in 4.1.
  We can introduce an additional constuctor for Query_log_event to pass desired
  (i.e system_character_info) charset different from THD's version.
  But I am delaying this while there are not more bugs similar to this one reported.

- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid


ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/TransporterFacade.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_autodiscover3.result:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/t/ndb_autodiscover3.test:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

Item_trigger_field::set_required_privilege(const bool rw) is an
overloading of Settable_routine_parameter::set_required_privilege(bool rw).