into  mysql.com:/home/mydev/mysql-5.1-bug10405

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

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


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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

  "NDB replication fails when no explicit--binlog-format given"
  fix initialization, storage engine initialization must occur after
  logging type is configured


sql/mysqld.cc:
  Bug#19536
    fix initialization, storage engine initialization must occur after
    logging type is configured

mysql-test/r/ndb_alter_table3.result:
  Rename: mysql-test/r/ndb_alter_table_row.result -> mysql-test/r/ndb_alter_table3.result
BitKeeper/deleted/.del-ndb_alter_table_stm.test~477011b3a3164cb3:
  Delete: mysql-test/t/ndb_alter_table_stm.test
BitKeeper/deleted/.del-ndb_alter_table_stm.result~2aef3740f2ed685a:
  Delete: mysql-test/r/ndb_alter_table_stm.result

  fix buglet when nr-delete-op gets page fault


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix buglet when nr-delete-op gets page fault

Fix bug where page is read, modified and then transaction abort
  and then puge is flushed causing lsn on page to be 0


storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix bug where page is read, modified and then transaction abort
    and then puge is flushed causing lsn on page to be 0

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.cpp:
  Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.hpp:
  Impl. support for using delayed page request, to simulate "full" page buffer cache

stilled small memleak
+ changed clear/init indexes code a litter

into  mysql.com:/home/mydev/mysql-5.1-bug10405

into  zim.(none):/home/mikael/bug19313

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


sql/sql_base.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean

storage/archive/cmakelists.txt:
  fix include path
storage/blackhole/cmakelists.txt:
  fix include path
storage/csv/cmakelists.txt:
  fix include path

into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysql.cc:
  Resolve conflict

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078

into  xiphis.org:/home/antony/work2/wl3201-final


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/innodb/mysql-5.1

into  mysql.com:/home/alexi/innodb/mysql-5.1


storage/innobase/include/dict0dict.ic:
  SCCS merged

 Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-5.0-ss521 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (bug #19366).

into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.


storage/innobase/include/dict0dict.ic:
  Null-merge.

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


innobase/include/dict0dict.ic:
  Null-merge.

 Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-4.1-ss26 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (Bug#19366).

into  mysql.com:/home/mydev/mysql-5.1-bug10405


storage/myisam/mi_check.c:
  Auto merged

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078


VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078


mysql-test/t/disabled.def:
  Enabling 'mysqldump' test because events should load normally now.
mysql-test/t/mysqldump.test:
  Add spaces and tabs to the end of statements, to prove trimming of 
  whitespace.
sql/event_timed.cc:
  Remove  */  close-comment characters at the end, just as sp_head does.
      
  The parser should be smarter about not giving us text that jumps semantic 
  levels, but that's an issue for another day.

into  zim.(none):/home/mikael/bug19313


sql/sql_table.cc:
  Auto merged

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

mysys/cmakelists.txt:
  Add new file to build.
tests/cmakelists.txt:
  Add new dependency on mysys

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


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged