mysql-test/r/events_logs_tests.result:
  update result
mysql-test/r/events_scheduling.result:
  update result
mysql-test/t/events_logs_tests.test:
  fix test
mysql-test/t/events_scheduling.test:
  add test case for bug 19170

into lmy004.:/work/mysql-5.1-new-clean

mysql-test/t/rpl_view-slave.opt:
  Post-merge fix

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


sql/sql_yacc.yy:
  Auto merged

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

Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue

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


sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


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

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

into lmy004.:/work/mysql-5.1-new-clean

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


sql/sql_repl.cc:
  Auto merged
sql/ha_innodb.cc:
  Manual merge 5.0 -> 5.1
sql/ha_innodb.h:
  Manual merge 5.0 -> 5.1
sql/handler.cc:
  Manual merge 5.0 -> 5.1
sql/handler.h:
  Manual merge 5.0 -> 5.1
sql/mysqld.cc:
  Manual merge 5.0 -> 5.1
sql/set_var.cc:
  Manual merge 5.0 -> 5.1
sql/sql_class.h:
  Manual merge 5.0 -> 5.1

BitKeeper/deleted/.del-Linuxmkisofs~c3340108ee428bfd:
  Delete: storage/ndb/home/bin/Linuxmkisofs
BitKeeper/deleted/.del-Solarismkisofs~f2352aa3eb74bf81:
  Delete: storage/ndb/home/bin/Solarismkisofs
BitKeeper/deleted/.del-cvs2cl.pl~f6dd53614cca3bd7:
  Delete: storage/ndb/home/bin/cvs2cl.pl
BitKeeper/deleted/.del-fix-cvs-root~85b114dffe4dcd71:
  Delete: storage/ndb/home/bin/fix-cvs-root
BitKeeper/deleted/.del-import-from-bk.sh~fd7b3609d1cb93cc:
  Delete: storage/ndb/home/bin/import-from-bk.sh
BitKeeper/deleted/.del-ndb_deploy~1d70ed639d03fc07:
  Delete: storage/ndb/home/bin/ndb_deploy
BitKeeper/deleted/.del-funcs.sh~19e11fb1f65b19e1:
  Delete: storage/ndb/home/lib/funcs.sh
BitKeeper/deleted/.del-ndbdoxy.pl~cc153c886e5d1085:
  Delete: storage/ndb/home/bin/ndbdoxy.pl
BitKeeper/deleted/.del-ngcalc~9f8fb4a518060935:
  Delete: storage/ndb/home/bin/ngcalc
BitKeeper/deleted/.del-parseConfigFile.awk~17f70292f412959a:
  Delete: storage/ndb/home/bin/parseConfigFile.awk
BitKeeper/deleted/.del-setup-test.sh~57acbf006ee61516:
  Delete: storage/ndb/home/bin/setup-test.sh
BitKeeper/deleted/.del-signallog2html.sh~11f078f3616cece4:
  Delete: storage/ndb/home/bin/signallog2html.sh
BitKeeper/deleted/.del-signallog2list.awk~9e3c7272618f8a3e:
  Delete: storage/ndb/home/bin/signallog2html.lib/signallog2list.awk
BitKeeper/deleted/.del-stripcr~87d0d3d45e5dcf97:
  Delete: storage/ndb/home/bin/stripcr
BitKeeper/deleted/.del-uniq_blocks.awk~c98f28fca67bec81:
  Delete: storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk

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

added missing setting of latest applied epoch

storage/ndb/test/ndbapi/bank/Bank.cpp:
  added skip create option to bank test program

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

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


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

+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/partition_info.h:
  Auto merged

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

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

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962

Review fixes


sql/partition_info.cc:
  Review fixes
sql/partition_info.h:
  Review fixes

Final review fixes


sql/mysql_priv.h:
  Final review fixes
sql/sql_table.cc:
  Final review fixes

  bug#19141, bug#18575
  
  Maek sure global dict lock is taken during create/drop file/filegroup


storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix error code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix c_blockState lock for createdrop file/filegroup
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix not master for create/drop file

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


storage/ndb/include/util/ndb_opts.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  manual merge
mysql-test/mysql-test-run.sh:
  manual merge
mysql-test/ndb/ndbcluster.sh:
  manual merge

  Fix error handling when out of diskspace


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix error handling when out of diskspace

    ndb: corrected initialization of records


mysql-test/Makefile.am:
  ndb: corrected install dir
sql/ha_ndbcluster.cc:
  ndb: corrected initialization of records

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

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

- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)

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


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

  A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
  this also likely fixes bug 18589 and explains 18808


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  remove debug printout
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that alloc bit is set if insert and first_op
storage/ndb/test/ndbapi/testBasic.cpp:
  testcase for bug#19245
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase for bug#19245