into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel


client/client_priv.h:
  Auto merged
client/mysqlslap.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


client/Makefile.am:
  Auto merged

  Extended test section
  Removed duplicate EXTRA_DIST


client/Makefile.am:
  Removed duplicate EXTRA_DIST
Makefile.am:
  Extended test section

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged

  Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches


configure.in:
  Don't install ndb man pages if no ndb configured
CMakeLists.txt:
  Removed Cybozu patches
include/config-win.h:
  Removed Cybozu patches
win/README:
  Removed Cybozu patches
win/configure.js:
  Removed Cybozu patches

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

mysys/my_thr_init.c:
  Enclose a variable declaration in the same '#ifdef' that also controls all access to the variable.
  This avoids warnings of "unused variable".

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel

sql/stacktrace.c:
  removed code duplication
sql/stacktrace.h:
  removed code duplication

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/mysql-test-run.pl:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Makefile.am:
  Added target for RPM debug mysql-test-run

  Don't use explicit calls to mysql-test-run in spec


Makefile.am:
  Don't use explicit calls to mysql-test-run in spec
support-files/mysql.spec.sh:
  Don't use explicit calls to mysql-test-run in spec

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


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

storage/archive/ha_archive.cc:
  Adding init for HA_STATUS_AUTO call

into  zim.(none):/home/brian/mysql/pread-archive-5.1


storage/archive/ha_archive.cc:
  Auto merged

Centralized init logic for starting a scan. 


storage/archive/ha_archive.cc:
  Removed multiple execution logic

storage/archive/ha_archive.cc:
  Adjusted lock positions to handle possible concurrency condition

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

    correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

- always store lsw first in ndb

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

Fixed comments to say MYSQL_TIME instead of old typedef TIME

into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Auto merged

Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded).

Kinda obvious that this was going to come up ;)


client/client_priv.h:
  New options
client/mysqlslap.c:
  Added option for pre/post run
mysql-test/r/mysqlslap.result:
  Updated tests
mysql-test/t/mysqlslap.test:
  Updated test

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

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


storage/ndb/tools/restore/Restore.cpp:
  manual merge

- set sizes for data

storage/archive/ha_archive.cc:
  New comments, added specific init for rebuild options.

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged