include/mysql_com.h:
  Fix for Bug#20208 "Blobs greater than 8K are being truncated to 8K"
sql/filesort.cc:
  Added a missing break point.
sql/item.cc:
  Made a function of a block of code.
sql/item.h:
  Added function string_field_type()

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  don't set errno without a real error

mysys/my_pread.c:
  don't set errno without a real error

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


sql/ha_ndbcluster.cc:
  Auto merged

(It failed even if test was marked as skipped)



sql/ha_ndbcluster.cc:
  Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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


sql/ha_ndbcluster.cc:
  manual merge

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  Fix our implementation of pread/pwrite: we did change the file pointer in our
  implementation, while the normal preads/pwrites don't. The new code is based
  on glibc version of pread/pwrite.

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

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


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/ha_ndbcluster.cc:
  Auto merged

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


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge

+ adopted signal to be as close as possible to 5.1...

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

Mark events_stress.test as 'big' as it's very slow on some machines


BitKeeper/etc/ignore:
  added server-tools/instance-manager/net_serv.cc
mysql-test/t/events_stress.test:
  Slow test: only run when using --big
mysql-test/t/rpl_ndb_auto_inc.test:
  Fix failing test

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


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into moonbone.local:/home/evgen/mysql-5.1-new

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


BitKeeper/etc/ignore:
  auto-union
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge


sql/mysqld.cc:
  Auto merged

mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

BitKeeper/etc/ignore:
  added *.gcno

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl


BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
sql/log.cc:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Deleted file in 5.1 (removed)
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Deleted file in 5.1 (removed)
include/my_sys.h:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.


VC++Files/mysql.sln:
  The "Max nt" configuration for some reason had the mysql_client_test
  project disabled. Enable it.

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


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

Improved definition of mysys configuration for -nt builds.


VC++Files/mysql.sln:
  Use the name 'nt' instead of 'Release' for configuration.
VC++Files/mysys/mysys.vcproj:
  Use the name 'nt' instead of 'Release' for configuration.
  Use separate output files for NT and non-NT configurations.

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged