ndb/src/kernel/blocks/ERROR_codes.txt:
  post merge 4.1->5.0
ndb/src/ndbapi/ndberror.c:
  post merge 4.1->5.0
ndb/test/ndbapi/testOIBasic.cpp:
  post merge 4.1->5.0

ndb/include/kernel/signaldata/TuxMaint.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  merge from 4.1
ndb/test/ndbapi/testOIBasic.cpp:
  merge from 4.1

ndb/include/kernel/signaldata/TuxMaint.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Notes.txt:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  handle multipl index update failure atomically
ndb/src/ndbapi/ndberror.c:
  handle multipl index update failure atomically
ndb/test/ndbapi/testOIBasic.cpp:
  handle multipl index update failure atomically

BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"



mysql-test/r/create.result:
  MEMORY, not HEAP
mysql-test/r/ps_1general.result:
  order changed in SHOW STORAGE ENGINES
mysql-test/r/variables.result:
  MEMORY, not HEAP
sql/handler.cc:
  the array of storage engine names is searched in index order, so we must put the preferred name
  before the alias so that the preferred name is printed by MySQL instead of the alias.
sql/log.cc:
  TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
  could not be opened.
sql/set_var.cc:
  --log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.

into mysql.com:/home/mydev/mysql-5.0-5000

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

sql/ha_ndbcluster.cc:
  Auto merged

Merged fix for bugfix to 5.0.


sql/table.h:
  Auto merged

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/r/sp.result:
  New test case for BUG#9004.
  Also updated some other results, since formerly "invisible" (but correct)
  warnings now are visible.
mysql-test/t/sp.test:
  New test case for BUG#9004.
sql/sql_error.cc:
  Don't reset warnings while executing a stored routine.
sql/sql_parse.cc:
  Don't reset warnings while executing a stored routine.

A fix of the original patch.
Correctly clear a bit from an enum value.

into mysql.com:/home/dlenev/src/mysql-5.0-bg9486


sql/sp_head.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

into mysql.com:/space/my/mysql-5.0

into mysql.com:/space/my/mysql-5.0-build

  Correct previous bugfix

sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Bug partially fixed by 9775/9102 work on SP function return.


mysql-test/r/sp.result:
  Bug#8861
    Test for bug
mysql-test/t/sp.test:
  Bug#8861
    Test for bug
sql/protocol.cc:
  Bug#8861
    Requires change in assertion

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

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

sql/ha_ndbcluster.cc:
  typo, no effect

into mysql.com:/space/my/mysql-5.0

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

into mysql.com:/space/my/mysql-5.0-build

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-5.0.clean

into mysql.com:/space/my/mysql-4.1

mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_cache.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged