Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge

1 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fffdd9037ec..013b8d49967 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2197,6 +2197,11 @@ sub run_mysqltest ($) {
     mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);
   }
 
+  # ----------------------------------------------------------------------
+  # export MYSQL_TEST variable containing <path>/mysqltest <args>
+  # ----------------------------------------------------------------------
+  $ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);
+
   return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
 }