into  mysql.com:/home/bk/w3023-mysql-5.1-new


sql/handler.h:
  Merge with mysql-5.1-new

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

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

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


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

BitKeeper/etc/ignore:
  Added libmysqld/event.cc libmysqld/event_executor.cc libmysqld/event_timed.cc to the ignore list

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


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  merge
mysql-test/t/ndb_bitfield.test:
  merge

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

ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure that node allocating id is allowed to transporter connect

New support for ignoring blobs during scans. We now seek past them if we determine that they are of no use to us. This is a big save in tables with blobs. Far less memory overhead and the seek is quite a bit faster. 


mysql-test/r/archive.result:
  New results
mysql-test/t/archive.test:
  More tests for indexes and new tests for being selective on selects.
sql/ha_archive.cc:
  We now look and see if blobs are needed, and if they are not, we seek past them.

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


include/my_base.h:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

BitKeeper/etc/ignore:
  Added libmysqld/ha_ndbcluster_binlog.cc libmysqld/rpl_injector.cc to the ignore list

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  separate events as default + typos

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

into  zim.tangent.org:/home/brian/mysql/slap-5.1

into  zim.tangent.org:/home/brian/mysql/slap-5.1

Added --use-threads option for porting to Windows. 


client/mysqlslap.c:
  Addinng thread option for porting to windows (second piece of code)
  Also added flush call to fix one bug
mysql-test/r/mysqlslap.result:
  New results
mysql-test/t/disabled.def:
  Bug 16167 should not be fixed
mysql-test/t/mysqlslap.test:
  Added test for new use-threads option

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

into lmy004.:/work/mysql-5.1-tt-copy-works

fix problem that gcc4 does not like at all


sql/event.h:
  fix problem that gcc4 does not like at all

mysql-test/include/have_ndb_extra.inc:
  New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
mysql-test/include/not_ndb.inc:
  New BitKeeper file ``mysql-test/include/not_ndb.inc''
mysql-test/r/have_ndb_extra.require:
  New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
mysql-test/r/ndb_alter_table_row.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
mysql-test/r/ndb_alter_table_stm.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
mysql-test/r/ndb_binlog_basic.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
mysql-test/r/ndb_binlog_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
mysql-test/r/ndb_multi_row.result:
  New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
mysql-test/r/not_ndb.require:
  New BitKeeper file ``mysql-test/r/not_ndb.require''
mysql-test/r/rpl_ndb_bank.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
mysql-test/r/rpl_ndb_basic.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
mysql-test/r/rpl_ndb_disk.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
mysql-test/r/rpl_ndb_idempotent.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
mysql-test/r/rpl_ndb_load.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
mysql-test/r/rpl_ndb_multi.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
mysql-test/r/rpl_ndb_sync.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
mysql-test/r/rpl_row_basic_7ndb.result:
  New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
mysql-test/t/ndb_alter_table_row.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
mysql-test/t/ndb_alter_table_stm.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
mysql-test/t/ndb_binlog_basic.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
mysql-test/t/ndb_binlog_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
mysql-test/t/ndb_multi_row.test:
  New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
mysql-test/t/rpl_ndb_bank.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
mysql-test/t/rpl_ndb_basic.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
mysql-test/t/rpl_ndb_disk.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
mysql-test/t/rpl_ndb_idempotent.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
mysql-test/t/rpl_ndb_load.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
mysql-test/t/rpl_ndb_multi.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
mysql-test/t/rpl_ndb_sync.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
mysql-test/t/rpl_row_basic_7ndb.test:
  New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
sql/ha_ndbcluster_binlog.cc:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
sql/ha_ndbcluster_binlog.h:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
sql/ha_ndbcluster_tables.h:
  New BitKeeper file ``sql/ha_ndbcluster_tables.h''
sql/rpl_injector.cc:
  New BitKeeper file ``sql/rpl_injector.cc''
sql/rpl_injector.h:
  New BitKeeper file ``sql/rpl_injector.h''
storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''

into  zim.tangent.org:/home/brian/mysql/slap-5.1

into  zim.tangent.org:/home/brian/mysql/slap-5.1

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

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

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


mysql-test/t/mysqltest.test:
  Auto merged

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

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

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

  Test cleanip per lars
.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
rpl_sp.test:
  Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test


mysql-test/t/rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
mysql-test/t/rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
mysql-test/r/rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
BitKeeper/deleted/.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
BitKeeper/deleted/.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
BitKeeper/deleted/.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
BitKeeper/deleted/.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
mysql-test/t/rpl_stm_mystery22.test:
  Test cleanip per lars
mysql-test/t/disabled.def:
  Test cleanip per lars
mysql-test/t/rpl_sp.test:
  Test cleanip per lars

into  mysql.com:/space/pekka/ndb/version/my51

into lmy004.:/work/mysql-5.1-tt-copy-works

- fix compile failure on QNX and FreeBSD


sql/event_executor.cc:
  time_t and my_time_t seem have the same length so cast
  in tztime.cc it's already done this way.
  Precautionary check at runtime about the sizes of my_time_t and time_t
sql/event_timed.cc:
  do time_t* cast to satisfy compilers on various platforms
  (QNX, FreeBSD)

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/usr/local/mysql/tmpbuild-5.1

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  bugfix
storage/ndb/test/ndbapi/test_event_merge.cpp:
  continue

into  mysql.com:/space/pekka/ndb/version/my51-rbr

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

storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add missing return value, otherwise Sun compiler complains.