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

mysql-test/lib/My/Options.pm:
  Allow $VAR as option
mysql-test/lib/My/SafeProcess.pm:
  Remove printouts
mysql-test/lib/My/Test.pm:
  New BitKeeper file ``mysql-test/lib/My/Test.pm''

Just treat var/tmp and $opt_tmndir that might be different or same. 

running on windows. Apparently Cygwin tries to emulate UNIX Socket and thus
fails to create one.

"eval use" it. Instead trap the error that occurs when creating the socket
on platforms that does not support it. 

Straigthen code to be more explicit

Also make it possible to specify a path to the suite, for example:
./mtr --suite=/some/path/to/suitedir 


mysql-test/lib/My/Find.pm:
  Extend 'my_find_paths' to glob path names

since it's used by the check

Don't allow unix socket path to be truncated 


mysql-test/lib/My/Platform.pm:
  Add check for unix socket path truncation
mysql-test/mysql-test-run.pl:
  Don't allow socket path to be truncated. Fail and ask user to correct the problem by
  using a shorter path with  --tmpdir

Fix warnings


mysql-test/mysql-test-run.pl:
  Symlink var/tmp to $opt_tmpdir if not using var/tmp
mysql-test/include/restart_mysqld.inc:
  Renama

the server dissapears
Check return code of 'mysql_ping'
Add "shutdown", call 'mysql_shutdown' on the current connection 


mysql-test/include/restart_mysqld.inc:
  Use "kill_server"
mysql-test/include/wait_until_connected_again.inc:
  Init $mysql_errno to 9999
  Add workaround for BUG#36228

mysql-test/include/wait_until_connected_again.inc:
  added new errno 1053
mysql-test/include/wait_until_disconnected.inc:
  added new errno 1053