into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
cmd-line-utils/readline/xmalloc.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
mysql-test/r/subselect.result:
  Use local.
sql/ha_ndbcluster.cc:
  Use local
storage/archive/ha_archive.cc:
  Use local.
support-files/compiler_warnings.supp:
  Use local
client/mysql_upgrade.c:
  Manual merge.
client/mysqltest.c:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.