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

into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_EE_err.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Auto merged
mysql-test/r/backup.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/rpl_loaddata_s.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_rewrt_db.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_000015-slave.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.sh:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
mysql-test/r/binlog_stm_blackhole.result:
  Merge 5.0 -> 5.1
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata_m.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_stm_log.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_timezone.result:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog2.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqltest.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_drop_db.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_loaddata_m.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_timezone.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-compat.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  Merge 5.0 -> 5.1

1 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test
index bb61f3383bc..25f87f9e661 100644
--- a/mysql-test/t/sp-destruct.test
+++ b/mysql-test/t/sp-destruct.test
@@ -16,9 +16,9 @@
 --source include/not_windows.inc
 
 # Backup proc table
---system rm -rf var/master-data/mysql/backup
---system mkdir var/master-data/mysql/backup
---system cp var/master-data/mysql/proc.* var/master-data/mysql/backup/
+--system rm -rf $MYSQLTEST_VARDIR/master-data/mysql/backup
+--system mkdir $MYSQLTEST_VARDIR/master-data/mysql/backup
+--system cp $MYSQLTEST_VARDIR/master-data/mysql/proc.* $MYSQLTEST_VARDIR/master-data/mysql/backup/
 
 use test;
 
@@ -53,7 +53,7 @@ insert into t1 values (0);
 flush table mysql.proc;
 
 # Thrashing the .frm file
---system echo 'saljdlfa' > var/master-data/mysql/proc.frm
+--system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
 --error ER_NOT_FORM_FILE
 call bug14233();
 --error ER_NOT_FORM_FILE
@@ -65,7 +65,7 @@ insert into t1 values (0);
 flush table mysql.proc;
 
 # Drop the mysql.proc table
---system rm var/master-data/mysql/proc.*
+--system rm $MYSQLTEST_VARDIR/master-data/mysql/proc.*
 --error ER_NO_SUCH_TABLE
 call bug14233();
 --error ER_NO_SUCH_TABLE
@@ -74,8 +74,8 @@ create view v1 as select bug14233_f();
 insert into t1 values (0);
 
 # Restore mysql.proc
---system mv var/master-data/mysql/backup/* var/master-data/mysql/
---system rmdir var/master-data/mysql/backup
+--system mv $MYSQLTEST_VARDIR/master-data/mysql/backup/* $MYSQLTEST_VARDIR/master-data/mysql/
+--system rmdir $MYSQLTEST_VARDIR/master-data/mysql/backup
 
 flush table mysql.proc;
 flush privileges;