Verbose SafeProcess.pm 


mysql-test/mysql-test-run.pl:
  Cleanup how script find ndb binaries and paths
  Remove "executable_setup_failed" code, i.e either we have ndb support or we don't
  Remove ndb_extra_test, not used by any test. If there is a need for that, just 
  create a new suite
mysql-test/lib/My/Find.pm:
  Add possibility to use my_find_bin for a binary that is not required
mysql-test/lib/My/SafeProcess.pm:
  Add verbose printous that can be turned on
  Wait on process also if start_kill failed
  Turn verbose on for windows
mysql-test/lib/My/SafeProcess/safe_kill_win.cc:
  Extend sleep from 0 to 100
mysql-test/lib/mtr_cases.pm:
  Remove ndb_extra
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
  Extra checks should be for Last_IO_Errno

mysql-test/lib/My/SafeProcess/Makefile.am:
  Update Makefile.am to dist all relevant files

mysql-test/include/default_mysqld.cnf:
  Use --slave-net-timeout instead of --set-variable=slave_net_timeout

diagnostics 

mysql-test/lib/My/SafeProcess.pm:
  Ifnore Ctrl-C in timer process
  Don't wait blocking for a preoces where start_kill fails
  Rewrite sart_kill to return 0 for error and > 1 for sucess
mysql-test/lib/My/SafeProcess/safe_process_win.cc:
  Add missing fflush(stderr) in 'die'

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged

Just retry OpenEvent a couple of times with a "yield" in between

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

process to kill hasn't yet created the event

before trying to creeate the table

Cleanup BACKUP dir from clusters datadir in case of test failure

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

Fix spelling error
Move exit_code into local scope

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

mysql-test/mysql-test-run.pl:
  Apply patch for bug#34995

mysql-test/suite/binlog/combinations:
  New BitKeeper file ``mysql-test/suite/binlog/combinations''

Add missing drop view


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Look for binlog in mysqlds datadir
  Update path to std-data
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Update result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Update result
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Add missing drop view
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Add missing drop view

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


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

mysql-test/extra/rpl_tests/rpl_charset.test:
  Fix merge error
mysql-test/lib/mtr_report.pm:
  Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
  Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
  Fix merge error(used "Use remote")

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-rpl_row_charset.test:
  Auto merged
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
  Auto merged
CMakeLists.txt:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/suite/federated/federated.result:
  Auto merged
mysql-test/suite/federated/federated.test:
  Auto merged
mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
  Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_load_from_master.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_trigger.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_big5.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix50117.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/trigger_notembedded.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/Makefile.am:
  SCCS merged
mysql-test/mysql-test-run.pl:
  Use local version of mtr.pl
mysql-test/lib/mtr_cases.pm:
  Use local mtr_cases.pm
mysql-test/suite/rpl/t/disabled.def:
  Use remote disabled file
mysql-test/t/disabled.def:
  Use remote disabled file
sql/ha_ndbcluster_binlog.cc:
  Use remote
mysql-test/extra/rpl_tests/rpl_charset.test:
  Manual merge
mysql-test/lib/mtr_report.pm:
  Manual merge
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
  Manual merge
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Manual merge
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Manual merge
mysql-test/suite/ndb/r/ndb_restore.result:
  Manual merge
mysql-test/suite/ndb/t/ndb_restore.test:
  Manual merge
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Manual merge
mysql-test/suite/rpl/r/rpl_stm_log.result:
  Manual merge
mysql-test/suite/rpl/t/rpl_row_sp005.test:
  Manual merge
mysql-test/t/log_state.test:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
mysql-test/t/mysqlbinlog2.test:
  Manual merge
mysql-test/t/upgrade.test:
  Manual merge

Run "mysql --bootstrap" with verbose if turned on

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  The test unnecessarily refused to run in non-debug mode. It can safely
  run in non-debug mode and produces the same result, so I removed the
  restriction.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Updated result file. It is a little unclear what the best thing to put in
  the binlog is, but the present results for this particular test are enough
  to replicate. Mats will figure out more as he fixes BUG#29020. After
  BUG#34768 has been fixed, these statements should be marked unsafe and
  not allowed in statement mode.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Updated result file. It is a little unclear what the best thing to put in
  the binlog is, but the present results for this particular test are enough
  to replicate. Mats will figure out more as he fixes BUG#29020. After
  BUG#34768 has been fixed, these statements should be marked unsafe and
  not allowed in statement mode.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/handler.cc:
  Auto merged