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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's

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


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

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  fix corruption due to page 0, file 0 gets released


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that page 0, file 0 isnt released

  rename error codes


mysql-test/t/ndb_dd_ddl.test:
  rename error code
sql/ha_ndbcluster.cc:
  rename error code
sql/share/errmsg.txt:
  rename error code

into  perch.ndb.mysql.com:/home/jonas/src/50-work


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

  better error message on invalid config change


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Change error message...note that this is a guess

  ndb - error while restarting in dict
        improve error message when changed config leads to failed restart


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  improve error message

  fix uninit variable in lgman


storage/ndb/src/kernel/blocks/lgman.cpp:
  fix uninit variable

  Fix for wierd var key restore problem


storage/ndb/src/kernel/blocks/restore.cpp:
  Fix? for wierd var key restore problem

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

  Fix a copule of dd bugs
    typo in lgman, potential run-time crash
    inconsistency in tup, potentially causing crash after SR


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that extentPtr.p->m_free_space is updated after page is written first time
    plus a number of new asserts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix so that extentPtr.p->m_free_space is updated after page is written first time
    plus a number of new asserts
storage/ndb/src/kernel/blocks/lgman.cpp:
  Fix a couple of asserts
  Fix a typo causing unpredictable crash "&= ~x" was "&= x"
storage/ndb/test/ndbapi/test_event.cpp:
  Fix test_event

  Fix possible deadlock when running with small log buffer, causing buffer to be full, but not page getting flushed


storage/ndb/src/kernel/blocks/lgman.cpp:
  Fix possible deadlock when running with small log buffer, causing buffer to be full, but not page getting flushed
storage/ndb/src/kernel/blocks/lgman.hpp:
  Fix possible deadlock when running with small log buffer, causing buffer to be full, but not page getting flushed

into  eel.(none):/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove debug printouts

into  poseidon.ndb.mysql.com:/home/tomas/mysql51


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

    enable extra logging in ndb handler during test runs


mysql-test/mysql-test-run.pl:
  enable extra logging in ndb handler during test runs
sql/ha_ndbcluster_binlog.cc:
  added more logging in ndb handler

storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Fix drop table with mapped pages

  Fix SR bug that extent pages was scanned before undo was run
  Fix bug wrt page flushing/tsman and tup's dirty page list


storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove some unused code
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add LCP_PREPARE to pgman
  Change order between TSMAN/LGMAN START_RECREQ
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/lgman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/pgman.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/tsman.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/test/tools/hugoLoad.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/tools/delete_all.cpp:
  Fix dd SR + dd free space bugs

into  poseidon.ndb.mysql.com:/home/tomas/mysql51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

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


client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
sql/sql_yacc.yy:
  Manual merge: resolve the conflict with moved sp_if rule

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge

into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype

A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
  Adding new function
Makefile.am:
  Adding build rules for uctypedump,
  a dump tool to create my_uctype.h
  using Unicode Character Database file.
m_ctype.h:
  Adding declaration of my_uni_ctype,
  ctype data for Unicode.
  Adding new member into MY_CHARSET_HANDLER
Makefile.am:
  Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
  new files:
  ctype data for unicode,
  and the tool to generate it from 
  a Unicode Character Database file.



include/Makefile.am:
  Adding my_uctype.h
include/m_ctype.h:
  Adding declaration of my_uni_ctype,
  ctype data for Unicode.
strings/Makefile.am:
  Adding build rules for uctypedump,
  a dump tool to create my_uctype.h
  using Unicode Character Database file.
strings/ctype-big5.c:
  Adding new function
strings/ctype-bin.c:
  Adding new function
strings/ctype-cp932.c:
  Adding new function
strings/ctype-euc_kr.c:
  Adding new function
strings/ctype-eucjpms.c:
  Adding new function
strings/ctype-gb2312.c:
  Adding new function
strings/ctype-gbk.c:
  Adding new function
strings/ctype-latin1.c:
  Adding new function
strings/ctype-mb.c:
  Adding new function
strings/ctype-simple.c:
  Adding new function
strings/ctype-sjis.c:
  Adding new function
strings/ctype-tis620.c:
  Adding new function
strings/ctype-ucs2.c:
  Adding new function
strings/ctype-ujis.c:
  Adding new function
strings/ctype-utf8.c:
  Adding new function

mysql-test/t/disabled.def:
  disabling new test that was added during null-merge from 5.0
  the new test innodb_unsafe_binlog will be re-enabled when the
  5.1 snapshot for InnoDB is applied. Disabling test rather than
  removing files to make future merges easier (removing the files
  would cause merge conflicts when the files are re-added in the
  5.1 snapshot).

sql/ha_ndbcluster.cc:
  ndbcluster_fill_files_table should return int

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge


sql/ha_innodb.cc:
  Auto merged

storage/example/ha_example.cc:
  add handlerton call for fill files table

mysql-test/r/ndb_dd_dump.result:
  New BitKeeper file ``mysql-test/r/ndb_dd_dump.result''
mysql-test/t/ndb_dd_dump.test:
  New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1


storage/innobase/include/lock0lock.h:
  Auto merged
mysql-test/r/innodb.result:
  null-merge from 5.0
mysql-test/t/innodb.test:
  null-merge from 5.0
sql/ha_innodb.cc:
  null-merge from 5.0
storage/innobase/include/data0type.h:
  null-merge from 5.0
storage/innobase/include/data0type.ic:
  null-merge from 5.0
storage/innobase/include/os0file.h:
  null-merge from 5.0
storage/innobase/include/row0mysql.h:
  null-merge from 5.0
storage/innobase/lock/lock0lock.c:
  null-merge from 5.0
storage/innobase/os/os0file.c:
  null-merge from 5.0
storage/innobase/row/row0ins.c:
  null-merge from 5.0
storage/innobase/row/row0mysql.c:
  null-merge from 5.0
storage/innobase/row/row0sel.c:
  null-merge from 5.0
storage/innobase/trx/trx0trx.c:
  null-merge from 5.0