bk commit into 5.1 tree (dlenev:1.2188)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2188 06/02/27 20:38:45 dlenev@stripped +1 -0
  Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
  into  mysql.com:/home/dlenev/src/mysql-5.1-merges2

  mysql-test/t/trigger.test
    1.37 06/02/27 20:38:38 dlenev@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.1-merges2/RESYNC

--- 1.36/mysql-test/t/trigger.test	2006-02-27 18:58:31 +03:00
+++ 1.37/mysql-test/t/trigger.test	2006-02-27 20:38:38 +03:00
@@ -1028,8 +1028,8 @@
        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 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;