Commit 01db6cc2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
parents 0f610081 3dd066e8

mysql-test/mysql-test-run.pl

+1 −7
Original line number Diff line number Diff line
@@ -671,11 +671,6 @@ sub command_line_setup () { 
    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 @@ sub executable_setup () { 
    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 @@ sub executable_setup () { 
  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");

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ drop table t1; 
--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;



#

mysql-test/lib/mtr_report.pl

+2 −2

File changed.

Contains only whitespace changes.