summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2007-11-23 15:03:43 +0100
committerunknown <msvensson@shellback.(none)>2007-11-23 15:03:43 +0100
commit7c338deb65fd5ede5ead6f7d63111c7f393fca8f (patch)
tree72e5549e3f2fedf70fafe5c92580e0c0e7a071d8
parente6e30345e74d44a8d83639876906c63efd182d20 (diff)
parentea9d91e82c5c02198cbaa2b52c6683b4ec191ee8 (diff)
downloadmariadb-git-7c338deb65fd5ede5ead6f7d63111c7f393fca8f.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-rpl
into shellback.(none):/home/msvensson/mysql/mysql-5.1-rpl-wl3949
-rw-r--r--mysql-test/lib/mtr_cases.pl1
-rwxr-xr-xmysql-test/mysql-test-run.pl3
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 0a58905c26d..91c4a315968 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -22,7 +22,6 @@ use File::Basename;
use IO::File();
use strict;
-use lib "lib/";
use My::Config;
sub collect_test_cases ($);
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 490eaabc37e..5bbd45758b5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -52,6 +52,9 @@
# "perl -d:Trace mysql-test-run.pl"
#
+
+use lib "lib/";
+
$Devel::Trace::TRACE= 0; # Don't trace boring init stuff
#require 5.6.1;