diff options
author | unknown <msvensson@pilot.(none)> | 2007-08-24 13:10:53 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-08-24 13:10:53 +0200 |
commit | cc27a7a0fb6d0c8d3d780b2f94cd3450ac933766 (patch) | |
tree | 4e84fe5522222f38ca396af47a75780ddc365cda /mysql-test/lib | |
parent | a94b075ae6615b102231e4f8101da5263c3c72bd (diff) | |
parent | 950a640ea07e1510642212d58b2707c315df3dfa (diff) | |
download | mariadb-git-cc27a7a0fb6d0c8d3d780b2f94cd3450ac933766.tar.gz |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_timer.pl:
Auto merged
Diffstat (limited to 'mysql-test/lib')
-rw-r--r-- | mysql-test/lib/mtr_timer.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl index d8b6953fb46..326fbea74ec 100644 --- a/mysql-test/lib/mtr_timer.pl +++ b/mysql-test/lib/mtr_timer.pl @@ -18,7 +18,6 @@ # and is part of the translation of the Bourne shell script with the # same name. -use Socket; use Errno; use strict; |