From db1ecaa1a29e958815befb2c6dbfd9a78229e6d1 Mon Sep 17 00:00:00 2001
From: "dlenev@mysql.com" <>
Date: Mon, 27 Feb 2006 20:32:32 +0300
Subject: [PATCH] Fix for trigger.test failures on pushbuild hosts introduced
 by fix for bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
---
 mysql-test/t/trigger.test | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index e1564e33a43..0ac57394c2f 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -1028,8 +1028,8 @@ select trigger_schema, trigger_name, event_object_schema,
        event_object_table, action_statement from information_schema.triggers
        where event_object_schema = 'test';
 # Trick which makes update of second .TRN file impossible
-system echo dummy >var/master-data/test/t1_ai.TRN~;
-system chmod 000 var/master-data/test/t1_ai.TRN~;
+system echo dummy >$MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+system chmod 000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
 --error 1
 rename table t1 to t2;
 # 't1' should be still there and triggers should work correctly
@@ -1038,7 +1038,8 @@ select @a, @b;
 select trigger_schema, trigger_name, event_object_schema,
        event_object_table, action_statement from information_schema.triggers
        where event_object_schema = 'test';
-system chmod 600 var/master-data/test/t1_ai.TRN;
+system chmod 600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
+system rm $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
 # Let us check that updates to .TRN files were rolled back too
 drop trigger t1_bi;
 drop trigger t1_ai;