into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/r/rpl_ndb_sync.result:
  manual merge
mysql-test/t/disabled.def:
  SCCS merged
mysql-test/t/rpl_ndb_sync.test:
  manual merge

mysql-test/t/rpl_trigger.test:
  Test cleanup
mysql-test/t/rpl_ndb_sync.test:
  Test cleanup
mysql-test/t/rpl_ndb_idempotent.test:
  Test cleanup
mysql-test/r/rpl_trigger.result:
  Updated result files
mysql-test/r/rpl_ndb_sync.result:
  Updated result files
mysql-test/r/rpl_ndb_idempotent.result:
  Updated result files
mysql-test/t/rpl_ndb_dd_basic.test:
  Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_dd_basic.result:
  Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/r/rpl_ndb_sp006.result:
  New results file
mysql-test/t/rpl_row_sp007_innodb-slave.opt:
  Ensure slave tables are created as innodb
mysql-test/t/disabled.def:
  updated 17290
mysql-test/r/rpl_ndb_sp007.result:
  New results file
mysql-test/t/rpl_ndb_sp007.test:
  Added comment
mysql-test/t/rpl_ndb_sp006.test:
  Added comment
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/r/rpl_ndb_sp003.result:
  New results file
mysql-test/t/rpl_ndb_sp003.test:
  Wrapper to use same code for testing NDB that is used for InnoDB Currently

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug

into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes

into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug

SHOW INSTANCE STATUS output


mysql-test/r/im_life_cycle.result:
  update result
mysql-test/t/im_life_cycle.imtest:
  fix test to take into account the new column
server-tools/instance-manager/commands.cc:
  add a version_no column to the SHOW INSTANCE STATUS output
server-tools/instance-manager/instance_options.cc:
  cleanup

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

corrected multiple --log-bin options in mysql-test-run


mysql-test/mysql-test-run.sh:
  corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
  changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
  changed to use temporary heap table on a ndb test

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

WL#1034 (Internal CRON)


sql/set_var.cc:
  remove volatile. fixes windows build

WL #1034 


mysql-test/r/events.result:
  update result after pull
mysql-test/t/events.test:
  comment

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

into lmy004.:/work/mysql-5.1-events_i_s

into  mysql.com:/home/alexi/innodb/mysql-5.1-merged


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

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


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

into lmy004.:/work/mysql-5.1-events_i_s


sql/sql_parse.cc:
  Auto merged

into lmy004.:/work/mysql-5.1-bug16984

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

  Applied 9680.patch (by Osku Salerma)

mysql-test/t/rpl_ps.test:
  Added order by for use with NDB
mysql-test/r/rpl_ps.result:
  Added order by for use with NDB
mysql-test/t/rpl_multi_delete.test:
  Added pk for NDB engine
mysql-test/t/rpl_multi_delete2.test:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete.result:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete2.result:
  Added pk for NDB engine
mysql-test/t/rpl_loadfile.test:
  Added sleep for use with NDB

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge
mysql-test/mysql-test-run.pl:
  Merge

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/deleted/.del-ndb_load.result:
  Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
  Delete: mysql-test/t/ndb_load.test
extra/perror.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge.

into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster


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

mysql-test/mysql-test-run.pl:
  Set $using_ndbcluster_master to 1 if cluster is supported, to force a stop of old running cluster

into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster


mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_stress.pl:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge 5.0 -> 5.1, added some comments and set skip if opt_skip_ndbcluster
mysql-test/mysql-test-run.pl:
  Merge backpoort from 5.0 -> 5.1

not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1


mysql-test/lib/mtr_cases.pl:
  Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
  Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
  Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
  Only start ndbcluster for testcases that needs it.

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


sql/sql_show.cc:
  Auto merged

win/cmakefiles/im:
  New BitKeeper file ``win/cmakefiles/im''

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

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


sql/sql_base.cc:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

  Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you were right


mysql-test/t/rpl_ndb_sync.test:
  Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you where right
mysql-test/r/rpl_ndb_sync.result:
  Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you where right

  Fixed bug in test case


mysql-test/r/rpl_stm_log.result:
  Fixed bug in test case

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_heap.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged