into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


libmysql/libmysql.c:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/make_binary_distribution.sh:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel


BitKeeper/etc/ignore:
  auto-union
libmysql/libmysql.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge from 5.0
storage/innobase/handler/ha_innodb.cc:
  Manual merge from 5.0

into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel


libmysql/libmysql.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge from main 5.1 to 5.1-marvel.
mysql-test/t/innodb_mysql.test:
  Manual merge from main 5.1 to 5.1-marvel.

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.1


scripts/make_binary_distribution.sh:
  Auto merged

  This script incorrectly generates the mysql_install_db file, causing the
  problems detailed in bug#28585.  The automake infrastructure correctly
  generates the script, so just copy it in place.


scripts/make_binary_distribution.sh:
  This script incorrectly generates the mysql_install_db file, causing the
  problems detailed in bug#28585.  The automake infrastructure correctly
  generates the script, so just copy it in place.

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


strings/ctype-uca.c:
  Auto merged
strings/ctype-mb.c:
  After merge fix.
strings/ctype-ucs2.c:
  After merge fix.

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345

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


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Not very clever fix for DIH incorrect REDO handling
    - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl


sql/sql_yacc.yy:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  In TC init node status for already started nodes during node restart
  (not present in 5.1)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  on node restart, make sure to init all already started nodes to NF_STARTED
ndb/test/ndbapi/testNodeRestart.cpp:
  test prg
ndb/test/run-test/daily-basic-tests.txt:
  test prg

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/my_base.h:
  Manual merge main->rpl 5.1
mysql-test/t/innodb.test:
  Manual merge main->rpl 5.1

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge

mysql-test/r/show_check.result:
  A post-merge fix (Bug#10491)

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
sql/item.h:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/create.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

mysql-test/r/ps_6bdb.result:
  Update test results (character sets patch).