bzr push into mysql-6.0-rpl branch (msvensson:2696 to 2697)

[Magnus Svensson]

 2697 Magnus Svensson	2008-09-15 [merge]
      merge
modified:
  mysql-test/mysql-test-run.pl

 2696 He Zhenxing	2008-09-12
      Post fixes of test after merge
modified:
  .bzr-mysql/default.conf
  mysql-test/r/backup_errors.result
  mysql-test/t/backup_db_grants.test
  mysql-test/t/backup_default.test
  mysql-test/t/backup_errors.test
  mysql-test/t/backup_timeout.test

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-09-11 20:20:47 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-09-15 10:24:18 +0000
@@ -619,6 +619,16 @@ sub run_worker ($) {
 
   $SIG{INT}= sub { exit(1); };
 
+  # Connect to server
+  my $server = new IO::Socket::INET
+    (
+     PeerAddr => 'localhost',
+     PeerPort => $server_port,
+     Proto    => 'tcp'
+    );
+  mtr_error("Could not connect to server at port $server_port: $!")
+    unless $server;
+
   # --------------------------------------------------------------------------
   # Set worker name
   # --------------------------------------------------------------------------
@@ -641,16 +651,6 @@ sub run_worker ($) {
 
   environment_setup();
 
-  # Connect to server
-  my $server = new IO::Socket::INET
-    (
-     PeerAddr => 'localhost',
-     PeerPort => $server_port,
-     Proto    => 'tcp'
-    );
-  mtr_error("Could not connect to server at port $server_port: $!")
-    unless $server;
-
   # Read hello from server which it will send when shared
   # resources have been setup
   my $hello= <$server>;
@@ -1546,8 +1546,9 @@ sub mysql_client_test_arguments(){
   # mysql_client_test executable may _not_ exist
   if ( $opt_embedded_server ) {
     $exe= mtr_exe_maybe_exists(
-	    vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'),
-	    "$basedir/libmysqld/examples/mysql_client_test_embedded");
+            vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'),
+	      "$basedir/libmysqld/examples/mysql_client_test_embedded",
+		"$basedir/bin/mysql_client_test_embedded");
   } else {
     $exe= mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'),
 			       "$basedir/tests/mysql_client_test",