From a24ca4153eb85e3a00c8c5f388bdc016a3258e27 Mon Sep 17 00:00:00 2001
From: sayantan dutta <sayantan.dutta@oracle.com>
Date: Thu, 4 Apr 2013 14:54:16 +0530
Subject: Bug #16401597 - MTR V1 RETURNS INCORRECT PATH TO VARIABLE @@BASEDIR

---
 mysql-test/lib/v1/mysql-test-run.pl | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'mysql-test/lib/v1')

diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
index c0d23b26fe2..791e5c450da 100755
--- a/mysql-test/lib/v1/mysql-test-run.pl
+++ b/mysql-test/lib/v1/mysql-test-run.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -133,7 +133,6 @@ our $path_timefile;
 our $path_snapshot;
 our $path_mysqltest_log;
 our $path_current_test_log;
-our $path_my_basedir;
 
 our $opt_vardir;                 # A path but set directly on cmd line
 our $path_vardir_trace;          # unix formatted opt_vardir for trace files
@@ -764,8 +763,6 @@ sub command_line_setup () {
   $glob_mysql_bench_dir= undef
     unless -d $glob_mysql_bench_dir;
 
-  $path_my_basedir=
-    $source_dist ? $glob_mysql_test_dir : $glob_basedir;
 
   $glob_timers= mtr_init_timers();
 
@@ -3125,7 +3122,7 @@ sub install_db ($$) {
   mtr_init_args(\$args);
   mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--bootstrap");
-  mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
+  mtr_add_arg($args, "--basedir=%s", $glob_basedir);
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=.");
@@ -3275,7 +3272,7 @@ log                 = $instance->{path_datadir}/mysqld$server_id.log
 log-error           = $instance->{path_datadir}/mysqld$server_id.err.log
 log-slow-queries    = $instance->{path_datadir}/mysqld$server_id.slow.log
 character-sets-dir  = $path_charsetsdir
-basedir             = $path_my_basedir
+basedir             = $glob_basedir
 server_id           = $server_id
 shutdown-delay      = 10
 skip-stack-trace
@@ -3866,7 +3863,7 @@ sub mysqld_arguments ($$$$) {
 
   mtr_add_arg($args, "%s--no-defaults", $prefix);
 
-  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);
+  mtr_add_arg($args, "%s--basedir=%s", $prefix, $glob_basedir);
   mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);
 
   if ( $mysql_version_id >= 50036)
-- 
cgit v1.2.1