Commit 822a4ac5 authored by kent@mysql.com's avatar kent@mysql.com

mtr_report.pl:

  Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line
parent bd417d15
...@@ -257,11 +257,11 @@ sub mtr_print_header () { ...@@ -257,11 +257,11 @@ sub mtr_print_header () {
print "\n"; print "\n";
if ( $::opt_timer ) if ( $::opt_timer )
{ {
print "TEST RESULT TIME (ms)\n"; print "TEST RESULT TIME (ms)\n";
} }
else else
{ {
print "TEST RESULT\n"; print "TEST RESULT\n";
} }
mtr_print_line(); mtr_print_line();
print "\n"; print "\n";
......
...@@ -659,11 +659,6 @@ sub command_line_setup () { ...@@ -659,11 +659,6 @@ sub command_line_setup () {
mtr_error("Coverage test needs the source - please use source dist"); 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 ) if ( $opt_gdb )
{ {
$opt_wait_timeout= 300; $opt_wait_timeout= 300;
...@@ -853,7 +848,7 @@ sub executable_setup () { ...@@ -853,7 +848,7 @@ sub executable_setup () {
if ( $glob_use_embedded_server ) if ( $glob_use_embedded_server )
{ {
my $path_examples= "$glob_basedir/libmysqld/examples"; 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= $exe_mysql_client_test=
mtr_exe_exists("$path_examples/mysql_client_test_embedded", mtr_exe_exists("$path_examples/mysql_client_test_embedded",
"/usr/bin/false"); "/usr/bin/false");
...@@ -878,7 +873,6 @@ sub executable_setup () { ...@@ -878,7 +873,6 @@ sub executable_setup () {
else else
{ {
$path_client_bindir= mtr_path_exists("$glob_basedir/bin"); $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_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow"); $exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog"); $exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
......
...@@ -138,7 +138,7 @@ drop table t1; ...@@ -138,7 +138,7 @@ drop table t1;
--exec $MYSQL_DUMP --skip-comments --databases test --exec $MYSQL_DUMP --skip-comments --databases test
create database mysqldump_test_db character set latin2 collate latin2_bin; 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; drop database mysqldump_test_db;
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment