=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- mysql-test/lib/v1/mysql-test-run.pl	2009-04-27 10:03:32 +0000
+++ mysql-test/lib/v1/mysql-test-run.pl	2009-07-21 09:43:04 +0000
@@ -269,6 +269,7 @@ my @default_valgrind_args= ("--show-reac
 my @valgrind_args;
 my $opt_valgrind_path;
 my $opt_callgrind;
+my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
 
 our $opt_stress=               "";
 our $opt_stress_suite=     "main";
@@ -641,6 +642,7 @@ sub command_line_setup () {
              'valgrind-option=s'        => \@valgrind_args,
              'valgrind-path=s'          => \$opt_valgrind_path,
 	     'callgrind'                => \$opt_callgrind,
+	     'debug-sync-timeout=i'     => \$opt_debug_sync_timeout,
 
              # Stress testing 
              'stress'                   => \$opt_stress,
@@ -805,7 +807,7 @@ sub command_line_setup () {
                                     "$glob_basedir/sql/share",
                                     "$glob_basedir/share");
 
-  $path_language=      mtr_path_exists("$path_share/english");
+  $path_language=      mtr_path_exists("$path_share");
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
 
 
@@ -1461,7 +1463,7 @@ sub collect_mysqld_features () {
   #
   # --datadir must exist, mysqld will chdir into it
   #
-  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`;
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmpdir --lc-messages-dir=$path_language --skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {
@@ -1803,7 +1805,7 @@ sub mysql_client_test_arguments()
   if ( $glob_use_embedded_server )
   {
     mtr_add_arg($args,
-      " -A --language=$path_language");
+      " -A --lc-messages-dir=$path_language");
     mtr_add_arg($args,
       " -A --datadir=$slave->[0]->{'path_myddir'}");
     mtr_add_arg($args,
@@ -3140,7 +3142,7 @@ sub install_db ($$) {
 
   if ( ! $glob_netware )
   {
-    mtr_add_arg($args, "--language=%s", $path_language);
+    mtr_add_arg($args, "--lc-messages-dir=%s", $path_language);
     mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);
   }
 
@@ -3876,7 +3878,7 @@ sub mysqld_arguments ($$$$) {
   }
 
   mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
-  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
+  mtr_add_arg($args, "%s--lc-messages-dir=%s", $prefix, $path_language);
   mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
 
   # Increase default connect_timeout to avoid intermittent
@@ -4111,6 +4113,11 @@ sub mysqld_arguments ($$$$) {
     mtr_add_arg($args, "%s--open-files-limit=1024", $prefix);
   }
 
+  # Enable the debug sync facility, set default wait timeout.
+  # Facility stays disabled if timeout value is zero.
+  mtr_add_arg($args, "--loose-debug-sync-timeout=%s",
+              $opt_debug_sync_timeout);
+
   return $args;
 }
 
@@ -5334,6 +5341,8 @@ Options for coverage, profiling etc
                         can be specified more then once
   valgrind-path=[EXE]   Path to the valgrind executable
   callgrind             Instruct valgrind to use callgrind
+  debug-sync-timeout=NUM Set default timeout for WAIT_FOR debug sync
+                        actions. Disable facility with NUM=0.
 
 Misc options