bk commit into 5.0 tree (kent:1.2027)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2027 05/09/30 02:15:36 kent@stripped +3 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  mysql-test/t/mysqldump.test
    1.66 05/09/30 02:15:33 kent@stripped +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.49 05/09/30 02:15:33 kent@stripped +0 -0
    Auto merged

  mysql-test/lib/mtr_report.pl
    1.17 05/09/30 02:15:33 kent@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-724072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.16/mysql-test/lib/mtr_report.pl	2005-09-14 14:34:41 +02:00
+++ 1.17/mysql-test/lib/mtr_report.pl	2005-09-30 02:15:33 +02:00
@@ -257,11 +257,11 @@
   print "\n";
   if ( $::opt_timer )
   {
-    print "TEST                            RESULT        TIME (ms)\n";
+    print "TEST                           RESULT         TIME (ms)\n";
   }
   else
   {
-    print "TEST                            RESULT\n";
+    print "TEST                           RESULT\n";
   }
   mtr_print_line();
   print "\n";

--- 1.48/mysql-test/mysql-test-run.pl	2005-09-29 03:18:46 +02:00
+++ 1.49/mysql-test/mysql-test-run.pl	2005-09-30 02:15:33 +02:00
@@ -671,11 +671,6 @@
     mtr_error("Coverage test needs the source - please use source dist");
   }
 
-  if ( $glob_use_embedded_server and ! $opt_source_dist )
-  {
-    mtr_error("Embedded server needs source tree - please use source dist");
-  }
-
   if ( $opt_gdb )
   {
     $opt_wait_timeout=  300;
@@ -902,7 +897,7 @@
     if ( $glob_use_embedded_server )
     {
       my $path_examples= "$glob_basedir/libmysqld/examples";
-      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest");
+      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest_embedded");
       $exe_mysql_client_test=
         mtr_exe_exists("$path_examples/mysql_client_test_embedded",
 		       "/usr/bin/false");
@@ -929,7 +924,6 @@
   else
   {
     $path_client_bindir= mtr_path_exists("$glob_basedir/bin");
-    $exe_mysqltest=      mtr_exe_exists("$path_client_bindir/mysqltest");
     $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
     $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
     $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

--- 1.65/mysql-test/t/mysqldump.test	2005-09-15 21:17:37 +02:00
+++ 1.66/mysql-test/t/mysqldump.test	2005-09-30 02:15:33 +02:00
@@ -142,7 +142,7 @@
 --exec $MYSQL_DUMP --skip-comments --databases test
 
 create database mysqldump_test_db character set latin2 collate latin2_bin;
---exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db;
+--exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db
 drop database mysqldump_test_db;
 
 #