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


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

Fix comments

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

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


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge

datadir can be saved in case of constantly failing servers
Remove datadirs each time all servers have been stopped thus limiting
the size of vardir.
The datadirs of failed tests have been saved and that should be
enough to diagnose any failures

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


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged

mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  updated result
mysql-test/suite/rpl_ndb/t/disabled.def:
  updated disabled list
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  updated test

mysql-test/lib/mtr_cases.pm:
  updated library
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  result file for test case

BitKeeper/deleted/.del-rpl_ndb_circular_2ch-master.opt:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt
BitKeeper/deleted/.del-rpl_ndb_circular_2ch-slave.opt:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt
BitKeeper/deleted/.del-rpl_circular_for_4_hosts-master.opt:
  Delete: mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt
BitKeeper/deleted/.del-rpl_circular_for_4_hosts-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt
mysql-test/include/circular_rpl_for_4_hosts_init.inc:
  initialization primitive
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
  result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  result file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf:
  config file for test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf:
  config file for test

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

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


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

mysql-test/suite/rpl/t/rpl_000015.cnf:
  Use test specific config file
mysql-test/suite/rpl/t/rpl_rotate_logs.cnf:
  Use test specific config file

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

Ie don't treat cluster_config.mysqld.1.1 as a section specifying a cluster

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


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

directory part
 

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

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


mysql-test/lib/mtr_cases.pm:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pm:
  Manual merge

into  mysql.com:/home/ksm/mysql/WL3754/commit-mysql-5.1-new-rpl

mysql-test/include/circular_rpl_for_4_hosts_init.inc:
  The primitive for 4 hosts non-cluster circular replication
mysql-test/include/circular_rpl_for_4_hosts_sync.inc:
  The primitive for sync for 4 hosts non-cluster circular replication
mysql-test/include/ndb_master-slave_2ch.inc:
  The primitive for initialization of two-channel cluster replication
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
  Result file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt:
  Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt:
  Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
  The test case for non-cluster circular replication A->B->C->D->A
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  Result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt:
  Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt:
  Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  The test case for cluster circular replication by two channels

so it will still look the same, but makes debugging much easier

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

we don't use Unix domin sockets for connection to server 

early versions of 5.1 and 5.0
Fix usage instruction of defaults_extra_file

moving the supressions from perl to SQL

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


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