into  mysql.com:/data0/knielsen/tmp-5.1

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


scripts/Makefile.am:
  Auto merged

binary disctribution for Falcon.


scripts/Makefile.am:
  Add the make_win_bin_dist script.
scripts/make_win_bin_dist:
  New BitKeeper file ``scripts/make_win_bin_dist''

into moonbone.local:/work/merge-5.1


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/ctype-mb.c:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/valgrind.supp:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.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
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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

into  mysql.com:/home/kgeorge/mysql/5.0/warnings


sql/opt_range.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/item_cmpfunc.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/spatial.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/sql_select.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code

into  mysql.com:/home/kgeorge/mysql/4.1/warnings

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

sql/item_cmpfunc.h:
  gcc 4.1 linux warning fixes backported from 5.0
sql/opt_range.cc:
  gcc 4.1 linux warning fixes.
sql/spatial.h:
  gcc 4.1 linux warning fixes backported from 5.0
sql/sql_select.h:
  gcc 4.1 linux warning fixes.
sql/sql_update.cc:
  gcc 4.1 linux warning fixes.